X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FWeak.c;h=17150f6b3cc7357d04aee573cb3a1d3d04bb9530;hb=4adc53ff5eb66b6beef9b38e18f23d00de2d56b4;hp=f0103952212399ca567866428f27390ef0015430;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/rts/Weak.c b/rts/Weak.c
index f010395..17150f6 100644
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -7,19 +7,55 @@
  * ---------------------------------------------------------------------------*/
 
 #include "PosixSource.h"
-#define COMPILING_RTS_MAIN
 #include "Rts.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(StgVoid *fn, StgVoid *ptr, StgVoid *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((StgVoid *)farr->payload[0],
+	                  (StgVoid *)farr->payload[1],
+	                  (StgVoid *)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
@@ -43,9 +79,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.
@@ -55,6 +94,14 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
 	    n++;
 	}
 
+	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],
+	                  farr->payload[3]);
+
 #ifdef PROFILING
         // A weak pointer is inherently used, so we do not need to call
         // LDV_recordDead().
@@ -67,10 +114,12 @@ 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;
 
-    IF_DEBUG(weak,debugBelch("weak: batching %d finalizers\n", n));
+    debugTrace(DEBUG_weak, "weak: batching %d finalizers", n);
 
     arr = (StgMutArrPtrs *)allocateLocal(cap, sizeofW(StgMutArrPtrs) + n);
     TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);