X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSchedAPI.h;h=8dff6ea63db55837524fbe0bfb0fcd8d45078a25;hb=76c0086f090327eecaf510de8bc4efc4dee996dc;hp=4c0d0ab2bfee39f826363bb067b41e96d0dd9eb5;hpb=d1a47b329fd21ab5a7db1dbe47959a874e8648e6;p=ghc-hetmet.git

diff --git a/ghc/includes/SchedAPI.h b/ghc/includes/SchedAPI.h
index 4c0d0ab..8dff6ea 100644
--- a/ghc/includes/SchedAPI.h
+++ b/ghc/includes/SchedAPI.h
@@ -1,7 +1,6 @@
 /* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.5 1999/07/03 18:39:41 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.
@@ -11,87 +10,27 @@
 #ifndef SCHEDAPI_H
 #define SCHEDAPI_H
 
-/*
- * Running the scheduler
- */
-
-typedef enum {
-    Success,      
-    Killed,	 /* another thread killed us                           */
-    Interrupted, /* stopped in response to a call to interruptStgRts   */
-    Deadlock,   
-    AllBlocked,  /* subtly different from Deadlock                     */
-} SchedulerStatus;
-      
-
-/* 
- * 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
- * 
- */
-#ifdef COMPILING_RTS
-
-SchedulerStatus schedule(StgTSO *main_thread, /*out*/StgClosure **ret);
+#if defined(GRAN)
+/* Dummy def for NO_PRI if not in GranSim */
+#define NO_PRI  0
+#endif
 
 /* 
  * Creating threads
  */
-
-StgTSO *createThread   (nat stack_size);
-
-static inline void pushClosure   (StgTSO *tso, StgClosure *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;
-  t = createThread(stack_size);
-  pushClosure(t,closure);
-  return t;
-}
-
-static inline StgTSO *
-createIOThread(nat stack_size,  StgClosure *closure) {
-  StgTSO *t;
-  t = createThread(stack_size);
-  pushRealWorld(t);
-  pushClosure(t,closure);
-  return t;
-}
-
-/*
- * Same as above, but also evaluate the result of the IO action
- * to whnf while we're at it.
- */
-
-static inline StgTSO *
-createStrictIOThread(nat stack_size,  StgClosure *closure) {
-  StgTSO *t;
-  t = createThread(stack_size);
-  pushClosure(t,closure);
-  pushClosure(t,(StgClosure*)&forceIO_closure);
-  return t;
-}
-
-
-/* 
- * Killing threads
- */
-
-void    deleteThread(StgTSO *tso);
-
-/*
- * Reverting CAFs
- */
-
-void RevertCAFs(void);
+#if defined(GRAN)
+StgTSO *createThread (Capability *cap, nat stack_size, StgInt pri);
+#else
+StgTSO *createThread (Capability *cap, nat stack_size);
 #endif
 
+Capability *scheduleWaitThread (StgTSO *tso, /*out*/HaskellObj* ret,
+				Capability *cap);
+
+StgTSO *createGenThread       (Capability *cap, nat stack_size,  
+			       StgClosure *closure);
+StgTSO *createIOThread        (Capability *cap, nat stack_size,  
+			       StgClosure *closure);
+StgTSO *createStrictIOThread  (Capability *cap, nat stack_size,  
+			       StgClosure *closure);
 #endif