X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.h;h=dedd6351b693bebc23ba0f0bac3584e29f2f17d5;hb=c6eadadbefe2ec5709e9d31893f79c4ff78754b4;hp=a2551d0cc5025b7427879aad57bf7ba069f2c212;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/rts/Capability.h b/rts/Capability.h
index a2551d0..dedd635 100644
--- a/rts/Capability.h
+++ b/rts/Capability.h
@@ -89,7 +89,8 @@ struct Capability_ {
 #endif
 
     // Per-capability STM-related data
-    StgTVarWaitQueue *free_tvar_wait_queues;
+    StgTVarWatchQueue *free_tvar_watch_queues;
+    StgInvariantCheckQueue *free_invariant_check_queues;
     StgTRecChunk *free_trec_chunks;
     StgTRecHeader *free_trec_headers;
     nat transaction_tokens;
@@ -199,6 +200,10 @@ void waitForCapability (Task *task, Mutex *mutex, Capability **pCap);
 // from the one held by the current Task).
 //
 void wakeupThreadOnCapability (Capability *cap, StgTSO *tso);
+void wakeupThreadOnCapability_lock (Capability *cap, StgTSO *tso);
+
+void migrateThreadToCapability (Capability *cap, StgTSO *tso);
+void migrateThreadToCapability_lock (Capability *cap, StgTSO *tso);
 
 // Wakes up a worker thread on just one Capability, used when we
 // need to service some global event.
@@ -227,6 +232,9 @@ extern void grabCapability (Capability **pCap);
 
 #endif /* !THREADED_RTS */
 
+// Free a capability on exit
+void freeCapability (Capability *cap);
+
 /* -----------------------------------------------------------------------------
  * INLINE functions... private below here
  * -------------------------------------------------------------------------- */