[project @ 2004-02-26 16:49:34 by simonmar]
[ghc-hetmet.git] / ghc / rts / Schedule.h
index da4a010..7e12482 100644 (file)
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Schedule.h,v 1.41 2003/10/01 10:57:43 wolfgang Exp $
+ * $Id: Schedule.h,v 1.44 2004/02/26 16:14:21 simonmar Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -151,7 +151,6 @@ extern  StgTSO *all_threads;
 #if defined(RTS_SUPPORTS_THREADS)
 /* Schedule.c has detailed info on what these do */
 extern Mutex       sched_mutex;
-extern Condition   thread_ready_cond;
 extern Condition   returning_worker_cond;
 extern nat         rts_n_waiting_workers;
 extern nat         rts_n_waiting_tasks;
@@ -258,17 +257,17 @@ void labelThread(StgPtr tso, char *label);
 
 /* Pop the first thread off the runnable queue.
  */
-#define POP_RUN_QUEUE()                                \
-  ({ StgTSO *t = run_queue_hd;                 \
-    if (t != END_TSO_QUEUE) {                  \
-      run_queue_hd = t->link;                  \
-      t->link = END_TSO_QUEUE;                 \
+#define POP_RUN_QUEUE(pt)                      \
+  do { StgTSO *__tmp_t = run_queue_hd;         \
+    if (__tmp_t != END_TSO_QUEUE) {            \
+      run_queue_hd = __tmp_t->link;            \
+      __tmp_t->link = END_TSO_QUEUE;           \
       if (run_queue_hd == END_TSO_QUEUE) {     \
         run_queue_tl = END_TSO_QUEUE;          \
       }                                                \
     }                                          \
-    t;                                         \
-  })
+    pt = __tmp_t;                              \
+  } while(0)
 
 /* Add a thread to the end of the blocked queue.
  */
@@ -314,4 +313,8 @@ void
 startSchedulerTaskIfNecessary(void);
 #endif
 
+#ifdef DEBUG
+extern void sched_belch(char *s, ...);
+#endif
+
 #endif /* __SCHEDULE_H__ */