X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=ccb9eb2e2a63207eaeb7cbe3e3e4082429877502;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=f161b6963e0dc573162307dd929a230630c6403d;hpb=28f4b2ae6a3bc32d048e73e6f49f9afdefaad780;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index f161b69..ccb9eb2 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.24 2002/06/13 11:41:15 simonmar Exp $
+ * $Id: Weak.c,v 1.32 2004/08/13 13:11:13 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;
+	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
 	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();
 } 
 
 /*
@@ -70,9 +75,14 @@ scheduleFinalizers(StgWeak *list)
     nat n;
 
     // count number of finalizers, and kill all the weak pointers 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 = 0;
+    for (w = list; w; w = w->link) { 
+
+	// 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);
+
+	if (w->finalizer != &stg_NO_FINALIZER_closure) {
 	    n++;
 	}
 
@@ -88,17 +98,20 @@ scheduleFinalizers(StgWeak *list)
 	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;
 
-    for (n = 0, w = list; w; w = w->link) {
-	if (w->header.info != &stg_DEAD_WEAK_info &&
-	    w->finalizer != &stg_NO_FINALIZER_closure) {
+    n = 0;
+    for (w = list; w; w = w->link) {
+	if (w->finalizer != &stg_NO_FINALIZER_closure) {
 	    arr->payload[n] = w->finalizer;
 	    n++;
 	}