RTS tidyup sweep, first phase

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

diff --git a/rts/Weak.c b/rts/Weak.c
index a50a72e..f5c3a62 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,8 +21,11 @@
 
 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);
@@ -36,17 +38,21 @@ runAllCFinalizers(StgWeak *list)
 {
     StgWeak *w;
 
+    running_finalizers = rtsTrue;
+
     for (w = list; w; w = w->link) {
        StgArrWords *farr;
 
        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;
 }
 
 /*
@@ -72,6 +78,8 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
     StgMutArrPtrs *arr;
     nat n;
 
+    running_finalizers = rtsTrue;
+
     // count number of finalizers, and kill all the weak pointers first...
     n = 0;
     for (w = list; w; w = w->link) { 
@@ -88,9 +96,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
@@ -105,6 +113,8 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
        SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
        
+    running_finalizers = rtsFalse;
+
     // No finalizers to run?
     if (n == 0) return;