X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FWeak.c;h=5546514243564c89a7989d7a0d250181cd464eaf;hb=8625c675de45bdb8bcfa795572ce7c47687c147c;hp=94bead37527ef6a3c76e1c17221f4b175e8ecaf2;hpb=0417404f5d1230c9d291ea9f73e2831121c8ec99;p=ghc-hetmet.git

diff --git a/rts/Weak.c b/rts/Weak.c
index 94bead3..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;
+    }
 }
 
 /*
@@ -78,8 +81,12 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
     StgMutArrPtrs *arr;
     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;
@@ -114,7 +121,9 @@ 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;