Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BLocker: Make misuse warning more useful.

Browse Source 
Also print the locker sem (for manual name lookup) and the involved
threads. It was also missing the line terminator which messed up the
following output.

Also fix a typo in a comment.
This commit is contained in:
Michael Lotz 2015-11-04 00:07:29 +01:00
parent 1cffe0dc51
commit 44f5830503
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kits/support/Locker.cpp
View File

@ -117,8 +117,12 @@ BLocker::Unlock()
// unlock. This is bad practice, but we must allow it for compatibility // unlock. This is bad practice, but we must allow it for compatibility
// reasons. We can at least warn the developer that something is probably // reasons. We can at least warn the developer that something is probably
// wrong. // wrong.
if (!IsLocked()) if (!IsLocked()) {
fprintf(stderr, "Trying to unlock from the wrong thread (#6400)"); fprintf(stderr, "Unlocking BLocker with sem %" B_PRId32
" from wrong thread %" B_PRId32 ", current holder %" B_PRId32
" (see issue #6400).\n", fSemaphoreID, find_thread(NULL),
fLockOwner);
}
// Decrement the number of outstanding locks this thread holds // Decrement the number of outstanding locks this thread holds
// on this BLocker. // on this BLocker.
@ -135,7 +139,7 @@ BLocker::Unlock()
int32 oldBenaphoreCount = atomic_add(&fBenaphoreCount, -1); int32 oldBenaphoreCount = atomic_add(&fBenaphoreCount, -1);
// If the oldBenaphoreCount is greater than 1, then there is // If the oldBenaphoreCount is greater than 1, then there is
// at lease one thread waiting for the lock in the case of a // at least one thread waiting for the lock in the case of a
// benaphore. // benaphore.
if (oldBenaphoreCount > 1) { if (oldBenaphoreCount > 1) {
// Since there are threads waiting for the lock, it must // Since there are threads waiting for the lock, it must