RTS tidyup sweep, first phase

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

diff --git a/rts/Weak.c b/rts/Weak.c
index a83cef9..f5c3a62 100644 (file)
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -7,20 +7,54 @@
  * ---------------------------------------------------------------------------*/
 
 #include "PosixSource.h"
-#define COMPILING_RTS_MAIN
 #include "Rts.h"
+#include "RtsAPI.h"
+
 #include "RtsUtils.h"
-#include "SchedAPI.h"
-#include "RtsFlags.h"
 #include "Weak.h"
-#include "Storage.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
+// to always be in the same order.
+
 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)
+{
+    if (flag)
+       ((void (*)(void *, void *))fn)(env, ptr);
+    else
+       ((void (*)(void *))fn)(ptr);
+}
+
+void
+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((void *)farr->payload[0],
+                         (void *)farr->payload[1],
+                         (void *)farr->payload[2],
+                         farr->payload[3]);
+    }
+
+    running_finalizers = rtsFalse;
+}
+
 /*
  * scheduleFinalizers() is called on the list of weak pointers found
  * to be dead after a garbage collection.  It overwrites each object
@@ -44,9 +78,12 @@ 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) { 
+       StgArrWords *farr;
 
        // Better not be a DEAD_WEAK at this stage; the garbage
        // collector removes DEAD_WEAKs from the weak pointer list.
@@ -56,6 +93,14 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
            n++;
        }
 
+       farr = (StgArrWords *)UNTAG_CLOSURE(w->cfinalizer);
+
+       if ((StgClosure *)farr != &stg_NO_FINALIZER_closure)
+           runCFinalizer((void *)farr->payload[0],
+                         (void *)farr->payload[1],
+                         (void *)farr->payload[2],
+                         farr->payload[3]);
+
 #ifdef PROFILING
         // A weak pointer is inherently used, so we do not need to call
         // LDV_recordDead().
@@ -68,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;