X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.c;h=510656f473b6c4911f54e32b12cc50cca2e87b1f;hb=refs%2Ftags%2F2006-12-16;hp=99c68fd3b8ea447a5f52732b7d8ff51406282c73;hpb=afdbaf48894b74eee5b6cc5c17c477d9e517f389;p=ghc-hetmet.git diff --git a/rts/Capability.c b/rts/Capability.c index 99c68fd..510656f 100644 --- a/rts/Capability.c +++ b/rts/Capability.c @@ -153,7 +153,8 @@ initCapability( Capability *cap, nat i ) cap->mut_lists[g] = NULL; } - cap->free_tvar_wait_queues = END_STM_WAIT_QUEUE; + cap->free_tvar_watch_queues = END_STM_WATCH_QUEUE; + cap->free_invariant_check_queues = END_INVARIANT_CHECK_QUEUE; cap->free_trec_chunks = END_STM_CHUNK_LIST; cap->free_trec_headers = NO_TREC; cap->transaction_tokens = 0; @@ -672,6 +673,7 @@ shutdownCapability (Capability *cap, Task *task) continue; } debugTrace(DEBUG_sched, "capability %d is stopped.", cap->no); + freeCapability(cap); RELEASE_LOCK(&cap->lock); break; } @@ -709,4 +711,11 @@ tryGrabCapability (Capability *cap, Task *task) #endif /* THREADED_RTS */ +void +freeCapability (Capability *cap) { + stgFree(cap->mut_lists); +#if defined(THREADED_RTS) || defined(PARALLEL_HASKELL) + freeSparkPool(&cap->r.rSparks); +#endif +}