Free various things we allocate

scpmw · Dec 15, 2006 · 221e74f · 221e74f
1 parent 80578b7
commit 221e74f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/rts/Capability.c b/rts/Capability.c
@@ -673,6 +673,8 @@ shutdownCapability (Capability *cap, Task *task)
 	    continue;
 	}
 	debugTrace(DEBUG_sched, "capability %d is stopped.", cap->no);
+        stgFree(cap->mut_lists);
+        freeSparkPool(&cap->r.rSparks);
 	RELEASE_LOCK(&cap->lock);
 	break;
     }

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
@@ -444,9 +444,14 @@ hs_exit(void)
     /* free shared Typeable store */
     exitTypeableStore();
 
-    /* initialise the stable pointer table */
+    /* free the stable pointer table */
     exitStablePtrTable();
 
+#if defined(DEBUG)
+    /* free the thread label table */
+    freeThreadLabelTable();
+#endif
+
     /* free hash table storage */
     exitHashTable();
 

diff --git a/rts/Sparks.c b/rts/Sparks.c
@@ -63,6 +63,11 @@ initSparkPools( void )
 #endif
 }
 
+void
+freeSparkPool(StgSparkPool *pool) {
+    stgFree(pool->base);
+}
+
 /* -----------------------------------------------------------------------------
  * 
  * findSpark: find a spark on the current Capability that we can fork

diff --git a/rts/Sparks.h b/rts/Sparks.h
@@ -12,6 +12,7 @@
 #if defined(PARALLEL_HASKELL) || defined(THREADED_RTS)
 StgClosure * findSpark         (Capability *cap);
 void         initSparkPools    (void);
+void         freeSparkPool     (StgSparkPool *pool);
 void         markSparkQueue    (evac_fn evac);
 void         createSparkThread (Capability *cap, StgClosure *p);
 

diff --git a/rts/ThreadLabels.c b/rts/ThreadLabels.c
@@ -28,6 +28,15 @@ initThreadLabelTable(void)
   }
 }
 
+void
+freeThreadLabelTable(void)
+{
+    if (threadLabels != NULL) {
+        freeHashTable(threadLabels, NULL);
+        threadLabels = NULL;
+    }
+}
+
 void
 updateThreadLabel(StgWord key, void *data)
 {

diff --git a/rts/ThreadLabels.h b/rts/ThreadLabels.h
@@ -12,6 +12,7 @@
 
 #if defined(DEBUG)
 void    initThreadLabelTable (void);
+void    freeThreadLabelTable (void);
 void    updateThreadLabel    (StgWord key, void *data);
 void *  lookupThreadLabel    (StgWord key);
 void    removeThreadLabel    (StgWord key);

diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
@@ -287,6 +287,7 @@ freeStorage (void)
 #if defined(THREADED_RTS)
     closeMutex(&sm_mutex);
     closeMutex(&atomic_modify_mutvar_mutex);
+    stgFree(nurseries);
 #endif
 }