diff options
| author | Edward Z. Yang <ezyang@mit.edu> | 2013-07-08 11:03:35 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@mit.edu> | 2013-07-09 11:29:11 -0700 |
| commit | 70e20631742e516c6a11c3c112fbd5b4a08c15ac (patch) | |
| tree | d0097f8b1c8e5c0a67b26bb950c036ea7684c65d /rts/Threads.c | |
| parent | ca9a431401755f119d97dec59a1fc963a8e9f681 (diff) | |
| download | haskell-70e20631742e516c6a11c3c112fbd5b4a08c15ac.tar.gz | |
Implement atomicReadMVar, fixing #4001.
We add the invariant to the MVar blocked threads queue that
threads blocked on an atomic read are always at the front of
the queue. This invariant is easy to maintain, since takers
are only ever added to the end of the queue.
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
Diffstat (limited to 'rts/Threads.c')
| -rw-r--r-- | rts/Threads.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rts/Threads.c b/rts/Threads.c index 4c990f118c..f2b800512e 100644 --- a/rts/Threads.c +++ b/rts/Threads.c @@ -255,6 +255,7 @@ tryWakeupThread (Capability *cap, StgTSO *tso) switch (tso->why_blocked) { case BlockedOnMVar: + case BlockedOnMVarRead: { if (tso->_link == END_TSO_QUEUE) { tso->block_info.closure = (StgClosure*)END_TSO_QUEUE; @@ -734,6 +735,9 @@ printThreadBlockage(StgTSO *tso) case BlockedOnMVar: debugBelch("is blocked on an MVar @ %p", tso->block_info.closure); break; + case BlockedOnMVarRead: + debugBelch("is blocked on atomic MVar read @ %p", tso->block_info.closure); + break; case BlockedOnBlackHole: debugBelch("is blocked on a black hole %p", ((StgBlockingQueue*)tso->block_info.bh->bh)); |