X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSchedAPI.h;h=07fe613f6d3245d10cd0453afb0db3abecb28482;hb=09e2c3a13ed67e2ab69a8e0a3eaa608e19713521;hp=565ed202319bb0481082d01c1459fb49ca9403ac;hpb=237ea701cf9634e88befa5f94252c916470473e3;p=ghc-hetmet.git

diff --git a/ghc/includes/SchedAPI.h b/ghc/includes/SchedAPI.h
index 565ed20..07fe613 100644
--- a/ghc/includes/SchedAPI.h
+++ b/ghc/includes/SchedAPI.h
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.15 2002/06/19 20:45:17 sof Exp $
+ * $Id: SchedAPI.h,v 1.19 2003/11/12 17:27:03 sof Exp $
  *
- * (c) The GHC Team 1998
+ * (c) The GHC Team 1998-2002
  *
  * External API for the scheduler.  For most uses, the functions in
  * RtsAPI.h should be enough.
@@ -16,7 +16,8 @@
 #define NO_PRI  0
 #endif
 
-extern SchedulerStatus waitThread(StgTSO *main_thread, /*out*/StgClosure **ret);
+extern SchedulerStatus waitThread(StgTSO *main_thread, /*out*/StgClosure **ret,
+                                  Capability *initialCapability);
 
 /* 
  * Creating threads
@@ -30,18 +31,15 @@ extern StgTSO *createThread(nat stack_size);
 extern void taskStart(void);
 #endif
 extern void scheduleThread(StgTSO *tso);
-extern SchedulerStatus scheduleWaitThread(StgTSO *tso, /*out*/HaskellObj* ret);
+extern SchedulerStatus scheduleWaitThread(StgTSO *tso, /*out*/HaskellObj* ret,
+                                          Capability *initialCapability);
 
-static inline void pushClosure   (StgTSO *tso, StgClosure *c) {
+INLINE_HEADER void pushClosure   (StgTSO *tso, StgWord c) {
   tso->sp--;
   tso->sp[0] = (W_) c;
 }
 
-static inline void pushRealWorld (StgTSO *tso) {
-  tso->sp--;
-  tso->sp[0] = (W_) REALWORLD_TAG;
-}
-static inline StgTSO *
+INLINE_HEADER StgTSO *
 createGenThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
 #if defined(GRAN)
@@ -49,11 +47,12 @@ createGenThread(nat stack_size,  StgClosure *closure) {
 #else
   t = createThread(stack_size);
 #endif
-  pushClosure(t,closure);
+  pushClosure(t, (W_)closure);
+  pushClosure(t, (W_)&stg_enter_info);
   return t;
 }
 
-static inline StgTSO *
+INLINE_HEADER StgTSO *
 createIOThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
 #if defined(GRAN)
@@ -61,8 +60,10 @@ createIOThread(nat stack_size,  StgClosure *closure) {
 #else
   t = createThread(stack_size);
 #endif
-  pushRealWorld(t);
-  pushClosure(t,closure);
+  pushClosure(t, (W_)&stg_noforceIO_info);
+  pushClosure(t, (W_)&stg_ap_v_info);
+  pushClosure(t, (W_)closure);
+  pushClosure(t, (W_)&stg_enter_info);
   return t;
 }
 
@@ -71,7 +72,7 @@ createIOThread(nat stack_size,  StgClosure *closure) {
  * to whnf while we're at it.
  */
 
-static inline StgTSO *
+INLINE_HEADER StgTSO *
 createStrictIOThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
 #if defined(GRAN)
@@ -79,8 +80,10 @@ createStrictIOThread(nat stack_size,  StgClosure *closure) {
 #else
   t = createThread(stack_size);
 #endif
-  pushClosure(t,closure);
-  pushClosure(t,(StgClosure*)&stg_forceIO_closure);
+  pushClosure(t, (W_)&stg_forceIO_info);
+  pushClosure(t, (W_)&stg_ap_v_info);
+  pushClosure(t, (W_)closure);
+  pushClosure(t, (W_)&stg_enter_info);
   return t;
 }
 
@@ -96,9 +99,4 @@ extern int  howManyThreadsAvail ( void );
  */
 extern void finishAllThreads ( void );
 
-/*
- * Reverting CAFs
- */
-extern void RevertCAFs ( void );
-
 #endif