X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=f216f62561d8b4505485ce69b3f1df36c02b5ccb;hb=af13609607da81e7837a7c7c598de82452363ab5;hp=c80cf8c3c1b9f364e8795b6edab226ae9a1e5fe9;hpb=db61851c5472bf565cd1da900b33d6e033fd743d;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index c80cf8c..f216f62 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.19 2001/11/22 14:25:13 simonmar Exp $
+ * $Id: Weak.c,v 1.27 2003/01/25 15:54:50 wolfgang Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -8,13 +8,14 @@
  * ---------------------------------------------------------------------------*/
 
 #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 "Prelude.h"
+#include "RtsAPI.h"
 
 StgWeak *weak_ptr_list;
 
@@ -33,25 +34,28 @@ finalizeWeakPointersNow(void)
 {
   StgWeak *w;
   
+#if defined(RTS_SUPPORTS_THREADS)
+  rts_lock();
+#endif
   while ((w = weak_ptr_list)) {
     weak_ptr_list = w->link;
     if (w->header.info != &stg_DEAD_WEAK_info) {
-        // @LDV profiling
-        // Even thought the info type of w changes, we DO NOT perform any
-        // LDV profiling because at this moment, LDV profiling must already
-        // have been terminated. See the comments in shutdownHaskell().
-        // At any rate, there is no need to call LDV_recordDead() because
-        // weak pointers are inherently used.
-#ifdef PROFILING
-        ASSERT(ldvTime == 0);   // LDV profiling is turned off.
-#endif
 	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) {
+#if defined(RTS_SUPPORTS_THREADS)
 	    rts_evalIO(w->finalizer,NULL);
+	    rts_unlock();
+	    rts_lock();
+#else
+	    rts_mainEvalIO(w->finalizer,NULL);
+#endif
 	}
     }
   }
+#if defined(RTS_SUPPORTS_THREADS)
+  rts_unlock();
+#endif
 } 
 
 /*
@@ -65,6 +69,8 @@ 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
@@ -75,23 +81,15 @@ scheduleFinalizers(StgWeak *list)
     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++;
-    }
-	
-    if (n == 0) return;
+    // count number of finalizers, and kill all the weak pointers first...
+    n = 0;
+    for (w = list; w; w = w->link) { 
 
-    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;
+	// 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);
 
-    for (n = 0, w = list; w; w = w->link) {
 	if (w->finalizer != &stg_NO_FINALIZER_closure) {
-	    arr->payload[n] = w->finalizer;
 	    n++;
 	}
 
@@ -106,6 +104,24 @@ scheduleFinalizers(StgWeak *list)
 #endif
 	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
     }
+	
+    // 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->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(