X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=f0103952212399ca567866428f27390ef0015430;hb=45252b35151fc55aa19fb6770df5ed8267639083;hp=854fcf9856d50a404d461aac02c2c592417d5ce1;hpb=b41f38a42b197dfb166ebfe78476b24982379e19;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index 854fcf9..f010395 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.8 1999/02/11 14:22:55 simonm Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,68 +6,92 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#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"
 
 StgWeak *weak_ptr_list;
 
 /*
- * finalizeWeakPointersNow() is called just before the system is shut
- * down.  It runs the finalizer for each weak pointer still in the
- * system.
+ * 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 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,
+ * however the value and finalizer fields have by now been marked live.
+ * 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
-finalizeWeakPointersNow(void)
+scheduleFinalizers(Capability *cap, StgWeak *list)
 {
-  StgWeak *w;
+    StgWeak *w;
+    StgTSO *t;
+    StgMutArrPtrs *arr;
+    nat n;
 
-  for (w = weak_ptr_list; w; w = 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);
-    }
-  }
-} 
+    // count number of finalizers, and kill all the weak pointers first...
+    n = 0;
+    for (w = list; w; w = w->link) { 
 
-/*
- * 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.
- */
+	// 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);
 
-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);
+	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;
 
-void
-markWeakList(void)
-{
-  StgWeak *w, **last_w;
+    IF_DEBUG(weak,debugBelch("weak: batching %d finalizers\n", n));
 
-  last_w = &weak_ptr_list;
-  for (w = weak_ptr_list; w; w = w->link) {
-    w = (StgWeak *)MarkRoot((StgClosure *)w);
-    *last_w = w;
-    last_w = &(w->link);
-  }
-}
+    arr = (StgMutArrPtrs *)allocateLocal(cap, sizeofW(StgMutArrPtrs) + n);
+    TICK_ALLOC_PRIM(sizeofW(StgMutArrPtrs), n, 0);
+    SET_HDR(arr, &stg_MUT_ARR_PTRS_FROZEN_info, CCS_SYSTEM);
+    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(cap, 
+		       RtsFlags.GcFlags.initialStkSize, 
+		       rts_apply(cap,
+			   rts_apply(cap,
+			       (StgClosure *)runFinalizerBatch_closure,
+			       rts_mkInt(cap,n)), 
+			   (StgClosure *)arr)
+	);
+    scheduleThread(cap,t);
+}