i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Make sure mutex::holder is set to a valid value

Browse Source
This commit is contained in:
Pawel Dziepak
2013-11-20 17:53:39 +01:00
parent 57d5d678f2
commit 3eb4224bf6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/locks/lock.cpp
+4 -1
View File
@@ -775,6 +775,9 @@ _mutex_unlock(mutex* lock)
lock->waiters = waiter->next; lock->waiters = waiter->next;
if (lock->waiters != NULL) if (lock->waiters != NULL)
lock->waiters->last = waiter->last; lock->waiters->last = waiter->last;
#if KDEBUG
thread_id unblockedThread = waiter->thread->id;
#endif
// unblock thread // unblock thread
thread_unblock(waiter->thread, B_OK); thread_unblock(waiter->thread, B_OK);
@@ -784,7 +787,7 @@ _mutex_unlock(mutex* lock)
// actually reflects the current situation, setting it to -1 would // actually reflects the current situation, setting it to -1 would
// cause a race condition, since another locker could think the lock // cause a race condition, since another locker could think the lock
// is not held by anyone. // is not held by anyone.
lock->holder = waiter->thread->id; lock->holder = unblockedThread;
#endif #endif
} else { } else {
// We've acquired the spinlock before the locker that is going to wait. // We've acquired the spinlock before the locker that is going to wait.