X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=ccb9eb2e2a63207eaeb7cbe3e3e4082429877502;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=4f8159f813533409afb40dfa11c03de0c9597108;hpb=b18c5cdd5ff0d910e30964cade546c61050e266f;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index 4f8159f..ccb9eb2 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.11 1999/07/06 15:05:49 sof Exp $
+ * $Id: Weak.c,v 1.32 2004/08/13 13:11:13 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,12 +7,16 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "PosixSource.h"
+#define COMPILING_RTS_MAIN
 #include "Rts.h"
-#include "RtsAPI.h"
 #include "SchedAPI.h"
 #include "RtsFlags.h"
 #include "Weak.h"
 #include "Storage.h"
+#include "Schedule.h"
+#include "Prelude.h"
+#include "RtsAPI.h"
 
 StgWeak *weak_ptr_list;
 
@@ -31,20 +35,26 @@ finalizeWeakPointersNow(void)
 {
   StgWeak *w;
   
+  rts_lock();
   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) {
+	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
+	IF_DEBUG(weak,fprintf(stderr,"Finalising weak pointer at %p -> %p\n", w, w->key));
+	if (w->finalizer != &stg_NO_FINALIZER_closure) {
+	    rts_evalLazyIO(w->finalizer,NULL);
+	    rts_unlock();
+	    rts_lock();
+	}
     }
   }
+  rts_unlock();
 } 
 
 /*
  * 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,
@@ -52,22 +62,67 @@ finalizeWeakPointersNow(void)
  * The weak pointer object itself may not be alive - i.e. we may be
  * looking at either an object in from-space or one in to-space.  It
  * doesn't really matter either way.
+ *
+ * Pre-condition: sched_mutex _not_ held.
  */
 
 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);
+    StgWeak *w;
+    StgTSO *t;
+    StgMutArrPtrs *arr;
+    nat n;
+
+    // count number of finalizers, and kill all the weak pointers first...
+    n = 0;
+    for (w = list; w; w = w->link) { 
+
+	// Better not be a DEAD_WEAK at this stage; the garbage
+	// collector removes DEAD_WEAKs from the weak pointer list.
+	ASSERT(w->header.info != &stg_DEAD_WEAK_info);
+
+	if (w->finalizer != &stg_NO_FINALIZER_closure) {
+	    n++;
+	}
+
+#ifdef PROFILING
+        // A weak pointer is inherently used, so we do not need to call
+        // LDV_recordDead().
+	//
+        // Furthermore, when PROFILING is turned on, dead weak
+        // pointers are exactly as large as weak pointers, so there is
+        // no need to fill the slop, either.  See stg_DEAD_WEAK_info
+        // in StgMiscClosures.hc.
 #endif
+	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
-    w->header.info = &DEAD_WEAK_info;
-  }
+	
+    // No finalizers to run?
+    if (n == 0) return;
+
+    IF_DEBUG(weak,fprintf(stderr,"weak: batching %d finalizers\n", n));
+
+    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + n);
+    TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);
+    SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
+    arr->mut_link = NULL;
+    arr->ptrs = n;
+
+    n = 0;
+    for (w = list; w; w = w->link) {
+	if (w->finalizer != &stg_NO_FINALIZER_closure) {
+	    arr->payload[n] = w->finalizer;
+	    n++;
+	}
+    }
+
+    t = createIOThread(RtsFlags.GcFlags.initialStkSize, 
+		       rts_apply(
+			   rts_apply(
+			       (StgClosure *)runFinalizerBatch_closure,
+			       rts_mkInt(n)), 
+			   (StgClosure *)arr)
+	);
+    scheduleThread(t);
 }