X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.c;h=510656f473b6c4911f54e32b12cc50cca2e87b1f;hb=refs%2Ftags%2F2006-12-16;hp=7fc1c577c4a170e2bf6ca6f774e0e55c25be574e;hpb=ac548e9fd9014cc372dcab31eb4c0392ee80ed4e;p=ghc-hetmet.git

diff --git a/rts/Capability.c b/rts/Capability.c
index 7fc1c57..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,14 +673,17 @@ shutdownCapability (Capability *cap, Task *task)
 	    continue;
 	}
 	debugTrace(DEBUG_sched, "capability %d is stopped.", cap->no);
+    freeCapability(cap);
 	RELEASE_LOCK(&cap->lock);
 	break;
     }
     // we now have the Capability, its run queue and spare workers
     // list are both empty.
 
-    // We end up here only in THREADED_RTS
-    closeMutex(&cap->lock);
+    // ToDo: we can't drop this mutex, because there might still be
+    // threads performing foreign calls that will eventually try to 
+    // return via resumeThread() and attempt to grab cap->lock.
+    // closeMutex(&cap->lock);
 }
 
 /* ----------------------------------------------------------------------------
@@ -707,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
+}