projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 14:22:16 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
SchedAPI.h
diff --git
a/ghc/includes/SchedAPI.h
b/ghc/includes/SchedAPI.h
index
0a53fa8
..
07fe613
100644
(file)
--- a/
ghc/includes/SchedAPI.h
+++ b/
ghc/includes/SchedAPI.h
@@
-1,7
+1,7
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.13 2001/03/22 03:51:09 hwloidl 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.
*
* External API for the scheduler. For most uses, the functions in
* RtsAPI.h should be enough.
@@
-16,37
+16,30
@@
#define NO_PRI 0
#endif
#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)
/*
* Creating threads
*/
#if defined(GRAN)
-StgTSO *createThread(nat stack_size, StgInt pri);
+extern StgTSO *createThread(nat stack_size, StgInt pri);
#else
#else
-StgTSO *createThread(nat stack_size);
+extern StgTSO *createThread(nat stack_size);
#endif
#if defined(PAR) || defined(SMP)
#endif
#if defined(PAR) || defined(SMP)
-void taskStart(void);
+extern void taskStart(void);
#endif
#endif
-void scheduleThread(StgTSO *tso);
+extern void scheduleThread(StgTSO *tso);
+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;
}
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)
createGenThread(nat stack_size, StgClosure *closure) {
StgTSO *t;
#if defined(GRAN)
@@
-54,11
+47,12
@@
createGenThread(nat stack_size, StgClosure *closure) {
#else
t = createThread(stack_size);
#endif
#else
t = createThread(stack_size);
#endif
- pushClosure(t,closure);
+ pushClosure(t, (W_)closure);
+ pushClosure(t, (W_)&stg_enter_info);
return t;
}
return t;
}
-static inline StgTSO *
+INLINE_HEADER StgTSO *
createIOThread(nat stack_size, StgClosure *closure) {
StgTSO *t;
#if defined(GRAN)
createIOThread(nat stack_size, StgClosure *closure) {
StgTSO *t;
#if defined(GRAN)
@@
-66,8
+60,10
@@
createIOThread(nat stack_size, StgClosure *closure) {
#else
t = createThread(stack_size);
#endif
#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;
}
return t;
}
@@
-76,7
+72,7
@@
createIOThread(nat stack_size, StgClosure *closure) {
* to whnf while we're at it.
*/
* to whnf while we're at it.
*/
-static inline StgTSO *
+INLINE_HEADER StgTSO *
createStrictIOThread(nat stack_size, StgClosure *closure) {
StgTSO *t;
#if defined(GRAN)
createStrictIOThread(nat stack_size, StgClosure *closure) {
StgTSO *t;
#if defined(GRAN)
@@
-84,8
+80,10
@@
createStrictIOThread(nat stack_size, StgClosure *closure) {
#else
t = createThread(stack_size);
#endif
#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;
}
return t;
}
@@
-101,9
+99,4
@@
extern int howManyThreadsAvail ( void );
*/
extern void finishAllThreads ( void );
*/
extern void finishAllThreads ( void );
-/*
- * Reverting CAFs
- */
-extern void RevertCAFs ( void );
-
#endif
#endif