[project @ 2005-10-21 14:02:17 by simonmar]
[ghc-hetmet.git] / ghc / rts / Weak.c
index afc8bae..f010395 100644 (file)
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.33 2004/09/03 15:28:59 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
 StgWeak *weak_ptr_list;
 
 /*
- * finalizeWeakPointersNow() is called just before the system is shut
- * down.  It runs the finalizer for each weak pointer still in the
- * system.
- *
- * Careful here - rts_evalIO might cause a garbage collection, which
- * might change weak_ptr_list.  Must re-load weak_ptr_list each time
- * around the loop.
- */
-
-void
-finalizeWeakPointersNow(void)
-{
-  StgWeak *w;
-  
-  rts_lock();
-  while ((w = weak_ptr_list)) {
-    weak_ptr_list = w->link;
-    if (w->header.info != &stg_DEAD_WEAK_info) {
-       SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
-       IF_DEBUG(weak,debugBelch("Finalising weak pointer at %p -> %p\n", w, w->key));
-       if (w->finalizer != &stg_NO_FINALIZER_closure) {
-           rts_evalLazyIO(w->finalizer,NULL);
-           rts_unlock();
-           rts_lock();
-       }
-    }
-  }
-  rts_unlock();
-} 
-
-/*
  * scheduleFinalizers() is called on the list of weak pointers found
  * to be dead after a garbage collection.  It overwrites each object
  * with DEAD_WEAK, and creates a new thread to run the pending finalizers.
@@ -68,7 +36,7 @@ finalizeWeakPointersNow(void)
  */
 
 void
-scheduleFinalizers(StgWeak *list)
+scheduleFinalizers(Capability *cap, StgWeak *list)
 {
     StgWeak *w;
     StgTSO *t;
@@ -104,10 +72,9 @@ scheduleFinalizers(StgWeak *list)
 
     IF_DEBUG(weak,debugBelch("weak: batching %d finalizers\n", n));
 
-    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + n);
+    arr = (StgMutArrPtrs *)allocateLocal(cap, sizeofW(StgMutArrPtrs) + n);
     TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);
     SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
-    arr->mut_link = NULL;
     arr->ptrs = n;
 
     n = 0;
@@ -118,12 +85,13 @@ scheduleFinalizers(StgWeak *list)
        }
     }
 
-    t = createIOThread(RtsFlags.GcFlags.initialStkSize, 
-                      rts_apply(
-                          rts_apply(
+    t = createIOThread(cap, 
+                      RtsFlags.GcFlags.initialStkSize, 
+                      rts_apply(cap,
+                          rts_apply(cap,
                               (StgClosure *)runFinalizerBatch_closure,
-                              rts_mkInt(n)), 
+                              rts_mkInt(cap,n)), 
                           (StgClosure *)arr)
        );
-    scheduleThread(t);
+    scheduleThread(cap,t);
 }