X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=1d97752aa2db05cabc51a54e0e1813a9d837c3d4;hb=73641e01ee9dfbe83f8c6225c1f6ae2e7d621b63;hp=5c71710a9ebd38d2213614871fe30c4e1d023fd8;hpb=6e2ea06c4a72866396f1b754ec8c2091a9b1e20b;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index 5c71710..1d97752 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.21 2002/02/18 13:26:13 sof Exp $
+ * $Id: Weak.c,v 1.25 2002/06/19 12:01:28 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -8,13 +8,14 @@
  * ---------------------------------------------------------------------------*/
 
 #include "PosixSource.h"
+#define COMPILING_RTS_MAIN
 #include "Rts.h"
-#include "RtsAPI.h"
 #include "SchedAPI.h"
 #include "RtsFlags.h"
 #include "Weak.h"
 #include "Storage.h"
 #include "Prelude.h"
+#include "RtsAPI.h"
 
 StgWeak *weak_ptr_list;
 
@@ -39,7 +40,7 @@ finalizeWeakPointersNow(void)
 	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_evalIO(w->finalizer,NULL);
+	    rts_mainEvalIO(w->finalizer,NULL);
 	}
     }
   }
@@ -68,23 +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->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->finalizer != &stg_NO_FINALIZER_closure) {
-	    arr->payload[n] = w->finalizer;
 	    n++;
 	}
 
@@ -99,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(