X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=462ceccb4db516dadb4dc3d5cc33a1eaad476844;hb=085afd3e54adb6a240b8c498bae29e4b7402525a;hp=fabe792ac53b23ee1f0787cc301933bcc1c5e46c;hpb=2107cde2a1407ab476ba706f5e45fc929ddb0c6f;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index fabe792..462cecc 100644
--- 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.31 2003/10/24 09:00:59 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -14,6 +14,7 @@
 #include "RtsFlags.h"
 #include "Weak.h"
 #include "Storage.h"
+#include "Schedule.h"
 #include "Prelude.h"
 #include "RtsAPI.h"
 
@@ -34,16 +35,20 @@ finalizeWeakPointersNow(void)
 {
   StgWeak *w;
   
+  rts_lock();
   while ((w = weak_ptr_list)) {
     weak_ptr_list = w->link;
     if (w->header.info != &stg_DEAD_WEAK_info) {
 	w->header.info = &stg_DEAD_WEAK_info;
 	IF_DEBUG(weak,fprintf(stderr,"Finalising weak pointer at %p -> %p\n", w, w->key));
 	if (w->finalizer != &stg_NO_FINALIZER_closure) {
-	    rts_mainEvalIO(w->finalizer,NULL);
+	    rts_evalLazyIO(w->finalizer,NULL);
+	    rts_unlock();
+	    rts_lock();
 	}
     }
   }
+  rts_unlock();
 } 
 
 /*
@@ -69,25 +74,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 +97,25 @@ 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);
+    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;
+    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(