fix #3910

[ghc-hetmet.git] / rts / Capability.h

diff --git a/rts/Capability.h b/rts/Capability.h
index d8eba0d..a15ce15 100644 (file)
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -4,6 +4,9 @@
  *
  * Capabilities
  *
+ * For details on the high-level design, see
+ *   http://hackage.haskell.org/trac/ghc/wiki/Commentary/Rts/Scheduler
+ *
  * A Capability holds all the state an OS thread/task needs to run
  * Haskell code: its STG registers, a pointer to its TSO, a nursery
  * etc. During STG execution, a pointer to the Capabilitity is kept in
@@ -22,7 +25,7 @@
 #include "Task.h"
 #include "Sparks.h"
 
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
 
 struct Capability_ {
     // State required by the STG virtual machine when running Haskell
@@ -76,6 +79,7 @@ struct Capability_ {
 #if defined(THREADED_RTS)
     // Worker Tasks waiting in the wings.  Singly-linked.
     Task *spare_workers;
+    nat n_spare_workers; // count of above
 
     // This lock protects running_task, returning_tasks_{hd,tl}, wakeup_queue.
     Mutex lock;
@@ -273,7 +277,7 @@ void freeCapabilities (void);
 
 // For the GC:
 void markSomeCapabilities (evac_fn evac, void *user, nat i0, nat delta, 
-                           rtsBool prune_sparks);
+                           rtsBool no_mark_sparks);
 void markCapabilities (evac_fn evac, void *user);
 void traverseSparkQueues (evac_fn evac, void *user);
 
@@ -354,6 +358,6 @@ INLINE_HEADER rtsBool emptyInbox(Capability *cap)
 
 #endif
 
-END_RTS_PRIVATE
+#include "EndPrivate.h"
 
 #endif /* CAPABILITY_H */