summaryrefslogtreecommitdiff
path: root/includes/rts/Threads.h
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2011-12-06 11:38:07 +0000
committerSimon Marlow <marlowsd@gmail.com>2011-12-06 15:19:18 +0000
commit8b75acd3ca25165536f18976c8d80cb62ad613e4 (patch)
treeccb87f6f5df2af15ca2ca8f65e5163b1f34886b8 /includes/rts/Threads.h
parent657773c8e59917fda05ee08065ec566aebb50a5f (diff)
downloadhaskell-8b75acd3ca25165536f18976c8d80cb62ad613e4.tar.gz
Make forkProcess work with +RTS -N
Consider this experimental for the time being. There are a lot of things that could go wrong, but I've verified that at least it works on the test cases we have. I also did some API cleanups while I was here. Previously we had: Capability * rts_eval (Capability *cap, HaskellObj p, /*out*/HaskellObj *ret); but this API is particularly error-prone: if you forget to discard the Capability * you passed in and use the return value instead, then you're in for subtle bugs with +RTS -N later on. So I changed all these functions to this form: void rts_eval (/* inout */ Capability **cap, /* in */ HaskellObj p, /* out */ HaskellObj *ret) It's much harder to use this version incorrectly, because you have to pass the Capability in by reference.
Diffstat (limited to 'includes/rts/Threads.h')
-rw-r--r--includes/rts/Threads.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/rts/Threads.h b/includes/rts/Threads.h
index c974142ce3..d2c4aff984 100644
--- a/includes/rts/Threads.h
+++ b/includes/rts/Threads.h
@@ -20,8 +20,9 @@
//
StgTSO *createThread (Capability *cap, nat stack_size);
-Capability *scheduleWaitThread (StgTSO *tso, /*out*/HaskellObj* ret,
- Capability *cap);
+void scheduleWaitThread (/* in */ StgTSO *tso,
+ /* out */ HaskellObj* ret,
+ /* inout */ Capability **cap);
StgTSO *createGenThread (Capability *cap, nat stack_size,
StgClosure *closure);