X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSchedule.h;h=0e18168755b0c1df65f3c38bdd5500bfca629456;hb=432b9c9322181a3644083e3c19b7e240d90659e7;hp=59bdb9e999045b40abb0a416002539c7e59426c8;hpb=e7987f16175f88daa11f06f25d10161a95f84bc4;p=ghc-hetmet.git

diff --git a/rts/Schedule.h b/rts/Schedule.h
index 59bdb9e..0e18168 100644
--- a/rts/Schedule.h
+++ b/rts/Schedule.h
@@ -12,6 +12,7 @@
 
 #include "OSThreads.h"
 #include "Capability.h"
+#include "EventLog.h"
 
 /* initScheduler(), exitScheduler()
  * Called from STG :  no
@@ -36,13 +37,7 @@ void scheduleThreadOn(Capability *cap, StgWord cpu, StgTSO *tso);
  * Called from STG :  yes
  * Locks assumed   :  none
  */
-#if defined(GRAN)
-void awakenBlockedQueue(StgBlockingQueueElement *q, StgClosure *node);
-#elif defined(PAR)
-void awakenBlockedQueue(StgBlockingQueueElement *q, StgClosure *node);
-#else
 void awakenBlockedQueue (Capability *cap, StgTSO *tso);
-#endif
 
 /* wakeUpRts()
  * 
@@ -70,27 +65,14 @@ StgWord findRetryFrameHelper (StgTSO *tso);
  * Called from STG :  NO
  * Locks assumed   :  none
  */
-void workerStart(Task *task);
-
-#if defined(GRAN)
-void    awaken_blocked_queue(StgBlockingQueueElement *q, StgClosure *node);
-void    unlink_from_bq(StgTSO* tso, StgClosure* node);
-void    initThread(StgTSO *tso, nat stack_size, StgInt pri);
-#elif defined(PAR)
-nat     run_queue_len(void);
-void    awaken_blocked_queue(StgBlockingQueueElement *q, StgClosure *node);
-void    initThread(StgTSO *tso, nat stack_size);
-#else
+#if defined(THREADED_RTS)
+void OSThreadProcAttr workerStart(Task *task);
+#endif
+
 char   *info_type(StgClosure *closure);    // dummy
 char   *info_type_by_ip(StgInfoTable *ip); // dummy
 void    awaken_blocked_queue(StgTSO *q);
 void    initThread(StgTSO *tso, nat stack_size);
-#endif
-
-/* Context switch flag.
- * Locks required  : none (conflicts are harmless)
- */
-extern int RTS_VAR(context_switch);
 
 /* The state of the scheduler.  This is used to control the sequence
  * of events during shutdown, and when the runtime is interrupted
@@ -100,7 +82,7 @@ extern int RTS_VAR(context_switch);
 #define SCHED_INTERRUPTING  1  /* ^C detected, before threads are deleted */
 #define SCHED_SHUTTING_DOWN 2  /* final shutdown */
 
-extern rtsBool RTS_VAR(sched_state);
+extern volatile StgWord RTS_VAR(sched_state);
 
 /* 
  * flag that tracks whether we have done any execution in this time slice.
@@ -116,22 +98,18 @@ extern rtsBool RTS_VAR(sched_state);
  * INACTIVE to DONE_GC happens under sched_mutex.  No lock required
  * to set it to ACTIVITY_YES.
  */
-extern nat recent_activity;
+extern volatile StgWord recent_activity;
 
 /* 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 *RTS_VAR(blackhole_queue);
 #if !defined(THREADED_RTS)
 extern  StgTSO *RTS_VAR(blocked_queue_hd), *RTS_VAR(blocked_queue_tl);
 extern  StgTSO *RTS_VAR(sleeping_queue);
 #endif
-#endif
 
 /* Set to rtsTrue if there are threads on the blackhole_queue, and
  * it is possible that one or more of them may be available to run.
@@ -142,6 +120,8 @@ extern  StgTSO *RTS_VAR(sleeping_queue);
  */
 extern rtsBool blackholes_need_checking;
 
+extern rtsBool heap_overflow;
+
 #if defined(THREADED_RTS)
 extern Mutex RTS_VAR(sched_mutex);
 #endif
@@ -163,9 +143,6 @@ void printAllThreads(void);
 #ifdef DEBUG
 void print_bq (StgClosure *node);
 #endif
-#if defined(PAR)
-void print_bqe (StgBlockingQueueElement *bqe);
-#endif
 
 /* -----------------------------------------------------------------------------
  * Some convenient macros/inline functions...
@@ -189,10 +166,10 @@ appendToRunQueue (Capability *cap, StgTSO *tso)
 	setTSOLink(cap, cap->run_queue_tl, tso);
     }
     cap->run_queue_tl = tso;
+    postEvent (cap, EVENT_THREAD_RUNNABLE, tso->id, 0);
 }
 
-/* Push a thread on the beginning of the run queue.  Used for
- * newly awakened threads, so they get run as soon as possible.
+/* Push a thread on the beginning of the run queue.
  * ASSUMES: cap->running_task is the current task.
  */
 INLINE_HEADER void
@@ -237,16 +214,21 @@ appendToBlockedQueue(StgTSO *tso)
 #endif
 
 #if defined(THREADED_RTS)
+// Assumes: my_cap is owned by the current Task.  We hold
+// other_cap->lock, but we do not necessarily own other_cap; another
+// Task may be running on it.
 INLINE_HEADER void
-appendToWakeupQueue (Capability *cap, StgTSO *tso)
+appendToWakeupQueue (Capability *my_cap, Capability *other_cap, StgTSO *tso)
 {
     ASSERT(tso->_link == END_TSO_QUEUE);
-    if (cap->wakeup_queue_hd == END_TSO_QUEUE) {
-	cap->wakeup_queue_hd = tso;
+    if (other_cap->wakeup_queue_hd == END_TSO_QUEUE) {
+	other_cap->wakeup_queue_hd = tso;
     } else {
-	setTSOLink(cap, cap->wakeup_queue_tl, tso);
+        // my_cap is passed to setTSOLink() because it may need to
+        // write to the mutable list.
+	setTSOLink(my_cap, other_cap->wakeup_queue_tl, tso);
     }
-    cap->wakeup_queue_tl = tso;
+    other_cap->wakeup_queue_tl = tso;
 }
 #endif