[project @ 2001-10-19 09:41:11 by sewardj]

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

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index 6032519..1c03e69 100644 (file)
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.10 1999/02/26 13:36:14 simonm Exp $
+ * $Id: Weak.c,v 1.18 2001/08/14 13:40:09 sewardj Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,11 +7,14 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "PosixSource.h"
 #include "Rts.h"
 #include "RtsAPI.h"
+#include "SchedAPI.h"
 #include "RtsFlags.h"
 #include "Weak.h"
 #include "Storage.h"
+#include "Prelude.h"
 
 StgWeak *weak_ptr_list;
 
@@ -32,10 +35,12 @@ finalizeWeakPointersNow(void)
   
   while ((w = weak_ptr_list)) {
     weak_ptr_list = w->link;
-    IF_DEBUG(weak,fprintf(stderr,"Finalising weak pointer at %p -> %p\n", w, w->key));
-    w->header.info = &DEAD_WEAK_info;
-    if (w->finalizer != &NO_FINALIZER_closure) {
-      rts_evalIO(w->finalizer,NULL);
+    if (w->header.info != &stg_DEAD_WEAK_info) {
+       w->header.info = &stg_DEAD_WEAK_info;
+       IF_DEBUG(weak,fprintf(stderr,"Finalising weak pointer at %p -> %p\n", w, w->key));
+       if (w->finalizer != &stg_NO_FINALIZER_closure) {
+           rts_evalIO(w->finalizer,NULL);
+       }
     }
   }
 } 
@@ -43,7 +48,7 @@ finalizeWeakPointersNow(void)
 /*
  * scheduleFinalizers() is called on the list of weak pointers found
  * to be dead after a garbage collection.  It overwrites each object
- * with DEAD_WEAK, and creates a new thread for the finalizer.
+ * with DEAD_WEAK, and creates a new thread to run the pending finalizers.
  *
  * This function is called just after GC.  The weak pointers on the
  * argument list are those whose keys were found to be not reachable,
@@ -56,17 +61,39 @@ finalizeWeakPointersNow(void)
 void
 scheduleFinalizers(StgWeak *list)
 {
-  StgWeak *w;
-  
-  for (w = list; w; w = w->link) {
-    IF_DEBUG(weak,fprintf(stderr,"Finalising weak pointer at %p -> %p\n", w, w->key));
-    if (w->finalizer != &NO_FINALIZER_closure) {
-#ifdef INTERPRETER
-      createGenThread(RtsFlags.GcFlags.initialStkSize, w->finalizer);
-#else
-      createIOThread(RtsFlags.GcFlags.initialStkSize, w->finalizer);
-#endif
+    StgWeak *w;
+    StgTSO *t;
+    StgMutArrPtrs *arr;
+    nat n;
+
+    /* count number of finalizers first... */
+    for (n = 0, w = list; w; w = w->link) { 
+       if (w->finalizer != &stg_NO_FINALIZER_closure)
+           n++;
     }
-    w->header.info = &DEAD_WEAK_info;
-  }
+       
+    if (n == 0) return;
+
+    IF_DEBUG(weak,fprintf(stderr,"weak: batching %d finalizers\n", n));
+
+    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + n);
+    SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
+    arr->ptrs = n;
+
+    for (n = 0, w = list; w; w = w->link) {
+       if (w->finalizer != &stg_NO_FINALIZER_closure) {
+           arr->payload[n] = w->finalizer;
+           n++;
+       }
+       w->header.info = &stg_DEAD_WEAK_info;
+    }
+
+    t = createIOThread(RtsFlags.GcFlags.initialStkSize, 
+                      rts_apply(
+                          rts_apply(
+                              (StgClosure *)runFinalizerBatch_closure,
+                              rts_mkInt(n)), 
+                          (StgClosure *)arr)
+       );
+    scheduleThread(t);
 }