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-02 18:23:25 by panne]
[ghc-hetmet.git]
/
ghc
/
includes
/
SchedAPI.h
diff --git
a/ghc/includes/SchedAPI.h
b/ghc/includes/SchedAPI.h
index
63d2d09
..
07fe613
100644
(file)
--- a/
ghc/includes/SchedAPI.h
+++ b/
ghc/includes/SchedAPI.h
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.16 2002/12/11 15:36:39 simonmar Exp $
+ * $Id: SchedAPI.h,v 1.19 2003/11/12 17:27:03 sof Exp $
*
* (c) The GHC Team 1998-2002
*
*
* (c) The GHC Team 1998-2002
*
@@
-16,7
+16,8
@@
#define NO_PRI 0
#endif
#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
/*
* Creating threads
@@
-30,14
+31,15
@@
extern StgTSO *createThread(nat stack_size);
extern void taskStart(void);
#endif
extern void scheduleThread(StgTSO *tso);
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, StgWord 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 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)
@@
-50,7
+52,7
@@
createGenThread(nat stack_size, StgClosure *closure) {
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)
@@
-70,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)
@@
-97,9
+99,4
@@
extern int howManyThreadsAvail ( void );
*/
extern void finishAllThreads ( void );
*/
extern void finishAllThreads ( void );
-/*
- * Reverting CAFs
- */
-extern void RevertCAFs ( void );
-
#endif
#endif