[project @ 2002-12-05 23:49:43 by mthomas]

[ghc-hetmet.git] / ghc / rts / Weak.c

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index fabe792..1d97752 100644 (file)
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.23 2002/04/26 22:31:31 sof Exp $
+ * $Id: Weak.c,v 1.25 2002/06/19 12:01:28 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -69,25 +69,15 @@ scheduleFinalizers(StgWeak *list)
     StgMutArrPtrs *arr;
     nat n;
 
-    /* count number of finalizers first... */
-    for (n = 0, w = list; w; w = w->link) { 
-       if (w->header.info != &stg_DEAD_WEAK_info &&
-           w->finalizer != &stg_NO_FINALIZER_closure)
-           n++;
-    }
-       
-    if (n == 0) return;
+    // count number of finalizers, and kill all the weak pointers first...
+    n = 0;
+    for (w = list; w; w = w->link) { 
 
-    IF_DEBUG(weak,fprintf(stderr,"weak: batching %d finalizers\n", n));
+       // Better not be a DEAD_WEAK at this stage; the garbage
+       // collector removes DEAD_WEAKs from the weak pointer list.
+       ASSERT(w->header.info != &stg_DEAD_WEAK_info);
 
-    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + n);
-    SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
-    arr->ptrs = n;
-
-    for (n = 0, w = list; w; w = w->link) {
-       if (w->header.info != &stg_DEAD_WEAK_info &&
-           w->finalizer != &stg_NO_FINALIZER_closure) {
-           arr->payload[n] = w->finalizer;
+       if (w->finalizer != &stg_NO_FINALIZER_closure) {
            n++;
        }
 
@@ -102,6 +92,23 @@ scheduleFinalizers(StgWeak *list)
 #endif
        SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
+       
+    // No finalizers to run?
+    if (n == 0) return;
+
+    IF_DEBUG(weak,fprintf(stderr,"weak: batching %d finalizers\n", n));
+
+    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + n);
+    SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
+    arr->ptrs = n;
+
+    n = 0;
+    for (w = list; w; w = w->link) {
+       if (w->finalizer != &stg_NO_FINALIZER_closure) {
+           arr->payload[n] = w->finalizer;
+           n++;
+       }
+    }
 
     t = createIOThread(RtsFlags.GcFlags.initialStkSize, 
                       rts_apply(