ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-23 04:48:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix race condition in monitorWait

Browse Source 
We don't want to check Thread::waiting until we have re-acquired the
monitor, since another thread might notify us between releasing
Thread::lock and acquiring the monitor.
This commit is contained in:
Joel Dice 2010-02-02 12:24:05 -07:00
parent 3bc37d6e2a
commit e92674cb73
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/machine.h
View File

@ -2508,7 +2508,6 @@ monitorWait(Thread* t, object monitor, int64_t time)
bool interrupted; bool interrupted;
unsigned depth; unsigned depth;
bool stillWaiting;
PROTECT(t, monitor); PROTECT(t, monitor);
@ -2524,13 +2523,11 @@ monitorWait(Thread* t, object monitor, int64_t time)
ENTER(t, Thread::IdleState); ENTER(t, Thread::IdleState);
interrupted = t->lock->wait(t->systemThread, time); interrupted = t->lock->wait(t->systemThread, time);
stillWaiting = t->waiting;
} }
monitorAcquire(t, monitor); monitorAcquire(t, monitor);
if (stillWaiting) { if (t->waiting) {
monitorRemoveWait(t, monitor); monitorRemoveWait(t, monitor);
} }