X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FWeak.c;h=5546514243564c89a7989d7a0d250181cd464eaf;hb=fff1f6194c3c39de53cd645bda9865fb131b1c68;hp=f5e918a92132d95b0fbc79249df36d09a0b20a6a;hpb=5270423a6afe69f1dc57e5e5a474812182718d40;p=ghc-hetmet.git

diff --git a/rts/Weak.c b/rts/Weak.c
index f5e918a..5546514 100644
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -21,9 +21,6 @@
 
 StgWeak *weak_ptr_list;
 
-// So that we can detect when a finalizer illegally calls back into Haskell
-rtsBool running_finalizers = rtsFalse;
-
 void
 runCFinalizer(void *fn, void *ptr, void *env, StgWord flag)
 {
@@ -37,8 +34,12 @@ void
 runAllCFinalizers(StgWeak *list)
 {
     StgWeak *w;
+    Task *task;
 
-    running_finalizers = rtsTrue;
+    task = myTask();
+    if (task != NULL) {
+        task->running_finalizers = rtsTrue;
+    }
 
     for (w = list; w; w = w->link) {
 	StgArrWords *farr;
@@ -52,7 +53,9 @@ runAllCFinalizers(StgWeak *list)
 	                  farr->payload[3]);
     }
 
-    running_finalizers = rtsFalse;
+    if (task != NULL) {
+        task->running_finalizers = rtsFalse;
+    }
 }
 
 /*
@@ -76,9 +79,14 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
     StgWeak *w;
     StgTSO *t;
     StgMutArrPtrs *arr;
-    nat n;
+    StgWord size;
+    nat n, i;
+    Task *task;
 
-    running_finalizers = rtsTrue;
+    task = myTask();
+    if (task != NULL) {
+        task->running_finalizers = rtsTrue;
+    }
 
     // count number of finalizers, and kill all the weak pointers first...
     n = 0;
@@ -113,17 +121,21 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
 	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
 	
-    running_finalizers = rtsFalse;
+    if (task != NULL) {
+        task->running_finalizers = rtsFalse;
+    }
 
     // No finalizers to run?
     if (n == 0) return;
 
     debugTrace(DEBUG_weak, "weak: batching %d finalizers", n);
 
-    arr = (StgMutArrPtrs *)allocate(cap, sizeofW(StgMutArrPtrs) + n);
+    size = n + mutArrPtrsCardTableSize(n);
+    arr = (StgMutArrPtrs *)allocate(cap, sizeofW(StgMutArrPtrs) + size);
     TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);
     SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
     arr->ptrs = n;
+    arr->size = size;
 
     n = 0;
     for (w = list; w; w = w->link) {
@@ -132,6 +144,10 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
 	    n++;
 	}
     }
+    // set all the cards to 1
+    for (i = n; i < size; i++) {
+        arr->payload[i] = (StgClosure *)(W_)(-1);
+    }
 
     t = createIOThread(cap, 
 		       RtsFlags.GcFlags.initialStkSize,