X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.h;h=94306eb6c008128a16f2704ae0a9041d49ffe211;hb=d572aed64d9c40dcc38a49b09d18f301555e4efb;hp=f13afe21174b13c82301de7f2b473801687f3700;hpb=4753cf734c79ad196ef4411393a1516465302f71;p=ghc-hetmet.git diff --git a/rts/Capability.h b/rts/Capability.h index f13afe2..94306eb 100644 --- a/rts/Capability.h +++ b/rts/Capability.h @@ -202,11 +202,8 @@ void waitForCapability (Task *task, Mutex *mutex, Capability **pCap); // Wakes up a thread on a Capability (probably a different Capability // 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); +void wakeupThreadOnCapability (Capability *my_cap, Capability *other_cap, + StgTSO *tso); // Wakes up a worker thread on just one Capability, used when we // need to service some global event. @@ -252,6 +249,8 @@ recordMutableCap (StgClosure *p, Capability *cap, nat gen) { bdescr *bd; + // We must own this Capability in order to modify its mutable list. + ASSERT(cap->running_task == myTask()); bd = cap->mut_lists[gen]; if (bd->free >= bd->start + BLOCK_SIZE_W) { bdescr *new_bd;