summaryrefslogtreecommitdiff
path: root/rts/Sanity.c
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-08-18 11:29:42 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-08-18 11:29:42 +0000
commitc5cafbcca54c4b1117bc43b31d86afa583fb7f62 (patch)
tree3ae6d082522b09a05efba47e55501b6dbad91a97 /rts/Sanity.c
parent0dffc568e18d34eeb6d1899ea767a3814d6be167 (diff)
downloadhaskell-c5cafbcca54c4b1117bc43b31d86afa583fb7f62.tar.gz
Fix #3429: a tricky race condition
There were two bugs, and had it not been for the first one we would not have noticed the second one, so this is quite fortunate. The first bug is in stg_unblockAsyncExceptionszh_ret, when we found a pending exception to raise, but don't end up raising it, there was a missing adjustment to the stack pointer. The second bug was that this case was actually happening at all: it ought to be incredibly rare, because the pending exception thread would have to be killed between us finding it and attempting to raise the exception. This made me suspicious. It turned out that there was a race condition on the tso->flags field; multiple threads were updating this bitmask field non-atomically (one of the bits is the dirty-bit for the generational GC). The fix is to move the dirty bit into its own field of the TSO, making the TSO one word larger (sadly).
Diffstat (limited to 'rts/Sanity.c')
-rw-r--r--rts/Sanity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/Sanity.c b/rts/Sanity.c
index 49bbff72c2..4430c4b6bd 100644
--- a/rts/Sanity.c
+++ b/rts/Sanity.c
@@ -581,7 +581,7 @@ checkGlobalTSOList (rtsBool checkTSOs)
// If this TSO is dirty and in an old generation, it better
// be on the mutable list.
if (tso->what_next == ThreadRelocated) continue;
- if (tso->flags & (TSO_DIRTY|TSO_LINK_DIRTY)) {
+ if (tso->dirty || (tso->flags & TSO_LINK_DIRTY)) {
ASSERT(Bdescr((P_)tso)->gen_no == 0 || (tso->flags & TSO_MARKED));
tso->flags &= ~TSO_MARKED;
}