merge upstream HEAD

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

diff --git a/rts/Weak.c b/rts/Weak.c
index 17150f6..5546514 100644 (file)
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -8,13 +8,12 @@
 
 #include "PosixSource.h"
 #include "Rts.h"
+#include "RtsAPI.h"
+
 #include "RtsUtils.h"
-#include "SchedAPI.h"
-#include "RtsFlags.h"
 #include "Weak.h"
 #include "Schedule.h"
 #include "Prelude.h"
-#include "RtsAPI.h"
 #include "Trace.h"
 
 // ForeignPtrs with C finalizers rely on weak pointers inside weak_ptr_list
@@ -22,11 +21,8 @@
 
 StgWeak *weak_ptr_list;
 
-// So that we can detect when a finalizer illegally calls back into Haskell
-rtsBool running_finalizers = rtsFalse;
-
 void
-runCFinalizer(StgVoid *fn, StgVoid *ptr, StgVoid *env, StgWord flag)
+runCFinalizer(void *fn, void *ptr, void *env, StgWord flag)
 {
     if (flag)
        ((void (*)(void *, void *))fn)(env, ptr);
@@ -38,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;
@@ -47,13 +47,15 @@ runAllCFinalizers(StgWeak *list)
        farr = (StgArrWords *)UNTAG_CLOSURE(w->cfinalizer);
 
        if ((StgClosure *)farr != &stg_NO_FINALIZER_closure)
-           runCFinalizer((StgVoid *)farr->payload[0],
-                         (StgVoid *)farr->payload[1],
-                         (StgVoid *)farr->payload[2],
+           runCFinalizer((void *)farr->payload[0],
+                         (void *)farr->payload[1],
+                         (void *)farr->payload[2],
                          farr->payload[3]);
     }
 
-    running_finalizers = rtsFalse;
+    if (task != NULL) {
+        task->running_finalizers = rtsFalse;
+    }
 }
 
 /*
@@ -77,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;
@@ -97,9 +104,9 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
        farr = (StgArrWords *)UNTAG_CLOSURE(w->cfinalizer);
 
        if ((StgClosure *)farr != &stg_NO_FINALIZER_closure)
-           runCFinalizer((StgVoid *)farr->payload[0],
-                         (StgVoid *)farr->payload[1],
-                         (StgVoid *)farr->payload[2],
+           runCFinalizer((void *)farr->payload[0],
+                         (void *)farr->payload[1],
+                         (void *)farr->payload[2],
                          farr->payload[3]);
 
 #ifdef PROFILING
@@ -114,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 *)allocateLocal(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) {
@@ -133,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,