merge upstream HEAD

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

diff --git a/rts/Weak.c b/rts/Weak.c
index 569bffb..5546514 100644 (file)
--- a/rts/Weak.c
+++ b/rts/Weak.c
@@ -7,19 +7,57 @@
  * ---------------------------------------------------------------------------*/
 
 #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 "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;
 
+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;
+    Task *task;
+
+    task = myTask();
+    if (task != NULL) {
+        task->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]);
+    }
+
+    if (task != NULL) {
+        task->running_finalizers = rtsFalse;
+    }
+}
+
 /*
  * scheduleFinalizers() is called on the list of weak pointers found
  * to be dead after a garbage collection.  It overwrites each object
@@ -41,11 +79,19 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
     StgWeak *w;
     StgTSO *t;
     StgMutArrPtrs *arr;
-    nat n;
+    StgWord size;
+    nat n, i;
+    Task *task;
+
+    task = myTask();
+    if (task != NULL) {
+        task->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 +101,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().
@@ -67,15 +121,21 @@ scheduleFinalizers(Capability *cap, StgWeak *list)
        SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
        
+    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) {
@@ -84,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,