X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSchedAPI.h;h=8dff6ea63db55837524fbe0bfb0fcd8d45078a25;hb=e6218fe7eff4e34e1a3c823cd4b7aebe09d2d4fb;hp=05d3ca859966923383a2651ba872420b04ac3523;hpb=9ff75d089614cce1cfa8c88344ace47698258bfa;p=ghc-hetmet.git

diff --git a/ghc/includes/SchedAPI.h b/ghc/includes/SchedAPI.h
index 05d3ca8..8dff6ea 100644
--- a/ghc/includes/SchedAPI.h
+++ b/ghc/includes/SchedAPI.h
@@ -1,7 +1,6 @@
 /* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.10 2000/04/14 15:18:05 sewardj 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.
@@ -12,95 +11,26 @@
 #define SCHEDAPI_H
 
 #if defined(GRAN)
-// Dummy def for NO_PRI if not in GranSim
+/* Dummy def for NO_PRI if not in GranSim */
 #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);
-
-/* 
  * Creating threads
  */
 #if defined(GRAN)
-StgTSO *createThread(nat stack_size, StgInt pri);
-#else
-StgTSO *createThread(nat stack_size);
-#endif
-void scheduleThread(StgTSO *tso);
-
-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;
-#if defined(GRAN)
-  t = createThread(stack_size, NO_PRI);
-#else
-  t = createThread(stack_size);
-#endif
-  pushClosure(t,closure);
-  return t;
-}
-
-static inline StgTSO *
-createIOThread(nat stack_size,  StgClosure *closure) {
-  StgTSO *t;
-#if defined(GRAN)
-  t = createThread(stack_size, NO_PRI);
-#else
-  t = createThread(stack_size);
-#endif
-  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;
-#if defined(GRAN)
-  t = createThread(stack_size, NO_PRI);
+StgTSO *createThread (Capability *cap, nat stack_size, StgInt pri);
 #else
-  t = createThread(stack_size);
+StgTSO *createThread (Capability *cap, nat stack_size);
 #endif
-  pushClosure(t,closure);
-  pushClosure(t,(StgClosure*)&forceIO_closure);
-  return t;
-}
 
+Capability *scheduleWaitThread (StgTSO *tso, /*out*/HaskellObj* ret,
+				Capability *cap);
 
-/* 
- * Killing threads
- */
-extern void deleteThread(StgTSO *tso);
-extern void deleteAllThreads ( void );
-extern int  howManyThreadsAvail ( void );
-/*
- * Run until there are no more threads.
- */
-extern void finishAllThreads ( void );
-
-/*
- * Reverting CAFs
- */
-extern void RevertCAFs ( void );
-
+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