[project @ 2003-10-12 13:24:52 by igloo]

[ghc-hetmet.git] / ghc / includes / SchedAPI.h

diff --git a/ghc/includes/SchedAPI.h b/ghc/includes/SchedAPI.h
index 05d3ca8..b0cee60 100644 (file)
--- a/ghc/includes/SchedAPI.h
+++ b/ghc/includes/SchedAPI.h
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.10 2000/04/14 15:18:05 sewardj Exp $
+ * $Id: SchedAPI.h,v 1.18 2003/09/21 22:20:53 wolfgang 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,33 +16,29 @@
 #define NO_PRI  0
 #endif
 
-/* 
- * schedule() plus the thread creation functions are not part
- * part of the external RTS API, so leave them out if we're
- * not compiling rts/ bits.   -- sof 7/99
- * 
- */
-SchedulerStatus waitThread(StgTSO *main_thread, /*out*/StgClosure **ret);
+extern SchedulerStatus waitThread(StgTSO *main_thread, /*out*/StgClosure **ret,
+                                  Capability *initialCapability);
 
 /* 
  * Creating threads
  */
 #if defined(GRAN)
-StgTSO *createThread(nat stack_size, StgInt pri);
+extern StgTSO *createThread(nat stack_size, StgInt pri);
 #else
-StgTSO *createThread(nat stack_size);
+extern StgTSO *createThread(nat stack_size);
 #endif
-void scheduleThread(StgTSO *tso);
+#if defined(PAR) || defined(SMP)
+extern void taskStart(void);
+#endif
+extern void scheduleThread(StgTSO *tso);
+extern SchedulerStatus scheduleWaitThread(StgTSO *tso, /*out*/HaskellObj* ret,
+                                          Capability *initialCapability);
 
-static inline void pushClosure   (StgTSO *tso, StgClosure *c) {
+static inline 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 *
 createGenThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
@@ -51,7 +47,8 @@ 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;
 }
 
@@ -63,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;
 }
 
@@ -81,8 +80,10 @@ createStrictIOThread(nat stack_size,  StgClosure *closure) {
 #else
   t = createThread(stack_size);
 #endif
-  pushClosure(t,closure);
-  pushClosure(t,(StgClosure*)&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;
 }
 
@@ -98,9 +99,4 @@ extern int  howManyThreadsAvail ( void );
  */
 extern void finishAllThreads ( void );
 
-/*
- * Reverting CAFs
- */
-extern void RevertCAFs ( void );
-
 #endif