diff options
author | Simon Marlow <marlowsd@gmail.com> | 2010-03-11 09:57:44 +0000 |
---|---|---|
committer | Simon Marlow <marlowsd@gmail.com> | 2010-03-11 09:57:44 +0000 |
commit | 7408b39235bccdcde48df2a73337ff976fbc09b7 (patch) | |
tree | cf20c372fdc5787170d53df36fc24ecf8113c89e /rts/ClosureFlags.c | |
parent | 12cfec943127f0c81e1ffa1ca5ce46e888e3027c (diff) | |
download | haskell-7408b39235bccdcde48df2a73337ff976fbc09b7.tar.gz |
Use message-passing to implement throwTo in the RTS
This replaces some complicated locking schemes with message-passing
in the implementation of throwTo. The benefits are
- previously it was impossible to guarantee that a throwTo from
a thread running on one CPU to a thread running on another CPU
would be noticed, and we had to rely on the GC to pick up these
forgotten exceptions. This no longer happens.
- the locking regime is simpler (though the code is about the same
size)
- threads can be unblocked from a blocked_exceptions queue without
having to traverse the whole queue now. It's a rare case, but
replaces an O(n) operation with an O(1).
- generally we move in the direction of sharing less between
Capabilities (aka HECs), which will become important with other
changes we have planned.
Also in this patch I replaced several STM-specific closure types with
a generic MUT_PRIM closure type, which allowed a lot of code in the GC
and other places to go away, hence the line-count reduction. The
message-passing changes resulted in about a net zero line-count
difference.
Diffstat (limited to 'rts/ClosureFlags.c')
-rw-r--r-- | rts/ClosureFlags.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/rts/ClosureFlags.c b/rts/ClosureFlags.c index 477a892594..358cb40ed3 100644 --- a/rts/ClosureFlags.c +++ b/rts/ClosureFlags.c @@ -74,20 +74,16 @@ StgWord16 closure_flags[] = { [MUT_VAR_CLEAN] = (_HNF| _NS| _MUT|_UPT ), [MUT_VAR_DIRTY] = (_HNF| _NS| _MUT|_UPT ), [WEAK] = (_HNF| _NS| _UPT ), - [STABLE_NAME] = (_HNF| _NS| _UPT ), + [PRIM] = (_HNF| _NS| _UPT ), + [MUT_PRIM] = (_HNF| _NS| _MUT|_UPT ), [TSO] = (_HNF| _NS| _MUT|_UPT ), - [TVAR_WATCH_QUEUE] = ( _NS| _MUT|_UPT ), - [INVARIANT_CHECK_QUEUE]= ( _NS| _MUT|_UPT ), - [ATOMIC_INVARIANT] = ( _NS| _MUT|_UPT ), - [TVAR] = (_HNF| _NS| _MUT|_UPT ), [TREC_CHUNK] = ( _NS| _MUT|_UPT ), - [TREC_HEADER] = ( _NS| _MUT|_UPT ), [ATOMICALLY_FRAME] = ( _BTM ), [CATCH_RETRY_FRAME] = ( _BTM ), [CATCH_STM_FRAME] = ( _BTM ), [WHITEHOLE] = ( 0 ) }; -#if N_CLOSURE_TYPES != 65 +#if N_CLOSURE_TYPES != 61 #error Closure types changed: update ClosureFlags.c! #endif |