projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-10-19 09:41:11 by sewardj]
[ghc-hetmet.git]
/
ghc
/
rts
/
Schedule.h
diff --git
a/ghc/rts/Schedule.h
b/ghc/rts/Schedule.h
index
219ca90
..
00b4de1
100644
(file)
--- a/
ghc/rts/Schedule.h
+++ b/
ghc/rts/Schedule.h
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Schedule.h,v 1.16 2000/03/16 17:27:13 simonmar Exp $
+ * $Id: Schedule.h,v 1.22 2001/03/22 03:51:10 hwloidl Exp $
*
* (c) The GHC Team 1998-1999
*
*
* (c) The GHC Team 1998-1999
*
@@
-58,10
+58,8
@@
void awakenBlockedQueue(StgTSO *tso);
* Called from STG : yes
* Locks assumed : none
*/
* Called from STG : yes
* Locks assumed : none
*/
-#if defined(GRAN)
-StgTSO *unblockOne(StgTSO *tso, StgClosure *node);
-#elif defined(PAR)
-StgTSO *unblockOne(StgTSO *tso, StgClosure *node);
+#if defined(GRAN) || defined(PAR)
+StgBlockingQueueElement *unblockOne(StgBlockingQueueElement *bqe, StgClosure *node);
#else
StgTSO *unblockOne(StgTSO *tso);
#endif
#else
StgTSO *unblockOne(StgTSO *tso);
#endif
@@
-86,6
+84,15
@@
void raiseAsync(StgTSO *tso, StgClosure *exception);
*/
void awaitEvent(rtsBool wait); /* In Select.c */
*/
void awaitEvent(rtsBool wait); /* In Select.c */
+/* wakeUpSleepingThreads(nat ticks)
+ *
+ * Wakes up any sleeping threads whose timers have expired.
+ *
+ * Called from STG : NO
+ * Locks assumed : sched_mutex
+ */
+rtsBool wakeUpSleepingThreads(nat); /* In Select.c */
+
// ToDo: check whether all fcts below are used in the SMP version, too
//@cindex awaken_blocked_queue
#if defined(GRAN)
// ToDo: check whether all fcts below are used in the SMP version, too
//@cindex awaken_blocked_queue
#if defined(GRAN)
@@
-113,7
+120,9
@@
void initThread(StgTSO *tso, nat stack_size);
extern nat context_switch;
extern rtsBool interrupted;
extern nat context_switch;
extern rtsBool interrupted;
-extern nat ticks_since_select;
+/* In Select.c */
+extern nat timestamp;
+extern nat ticks_since_timestamp;
//@cindex Capability
/* Capability type
//@cindex Capability
/* Capability type
@@
-132,9
+141,17
@@
extern Capability MainRegTable;
/* Thread queues.
* Locks required : sched_mutex
/* Thread queues.
* Locks required : sched_mutex
+ *
+ * In GranSim we have one run/blocked_queue per PE.
*/
*/
+#if defined(GRAN)
+// run_queue_hds defined in GranSim.h
+#else
extern StgTSO *run_queue_hd, *run_queue_tl;
extern StgTSO *blocked_queue_hd, *blocked_queue_tl;
extern StgTSO *run_queue_hd, *run_queue_tl;
extern StgTSO *blocked_queue_hd, *blocked_queue_tl;
+extern StgTSO *sleeping_queue;
+#endif
+/* Linked list of all threads. */
extern StgTSO *all_threads;
#ifdef SMP
extern StgTSO *all_threads;
#ifdef SMP
@@
-160,16
+177,10
@@
typedef struct {
extern task_info *task_ids;
#endif
extern task_info *task_ids;
#endif
-#if !defined(GRAN)
-extern StgTSO *run_queue_hd, *run_queue_tl;
-extern StgTSO *blocked_queue_hd, *blocked_queue_tl;
-#endif
-
/* Needed by Hugs.
*/
void interruptStgRts ( void );
/* Needed by Hugs.
*/
void interruptStgRts ( void );
-// ?? needed -- HWL
void raiseAsync(StgTSO *tso, StgClosure *exception);
nat run_queue_len(void);
void raiseAsync(StgTSO *tso, StgClosure *exception);
nat run_queue_len(void);
@@
-186,13
+197,15
@@
void printThreadStatus(StgTSO *tso);
void printAllThreads(void);
#endif
void print_bq (StgClosure *node);
void printAllThreads(void);
#endif
void print_bq (StgClosure *node);
+#if defined(PAR)
+void print_bqe (StgBlockingQueueElement *bqe);
+#endif
/* -----------------------------------------------------------------------------
* Some convenient macros...
*/
/* -----------------------------------------------------------------------------
* Some convenient macros...
*/
-#define END_TSO_QUEUE ((StgTSO *)(void*)&END_TSO_QUEUE_closure)
-#define END_CAF_LIST ((StgCAF *)(void*)&END_TSO_QUEUE_closure)
+/* END_TSO_QUEUE and friends now defined in includes/StgMiscClosures.h */
//@cindex APPEND_TO_RUN_QUEUE
/* Add a thread to the end of the run queue.
//@cindex APPEND_TO_RUN_QUEUE
/* Add a thread to the end of the run queue.
@@
-218,7
+231,7
@@
void print_bq (StgClosure *node);
run_queue_tl = tso; \
}
run_queue_tl = tso; \
}
-//@cindex POP_RUN_QUEUE
+//@cindex POP_RUN_QUEUE
/* Pop the first thread off the runnable queue.
*/
#define POP_RUN_QUEUE() \
/* Pop the first thread off the runnable queue.
*/
#define POP_RUN_QUEUE() \
@@
-259,6
+272,11
@@
void print_bq (StgClosure *node);
#define THREAD_RUNNABLE() /* nothing */
#endif
#define THREAD_RUNNABLE() /* nothing */
#endif
+//@cindex EMPTY_RUN_QUEUE
+/* Check whether the run queue is empty i.e. the PE is idle
+ */
+#define EMPTY_RUN_QUEUE() (run_queue_hd == END_TSO_QUEUE)
+
//@node Index, , Some convenient macros
//@subsection Index
//@node Index, , Some convenient macros
//@subsection Index