Don't build GHC with breakpoint support by default.

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

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index c80cf8c..f010395 100644 (file)
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.19 2001/11/22 14:25:13 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -8,53 +7,20 @@
  * ---------------------------------------------------------------------------*/
 
 #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.
- *
- * Careful here - rts_evalIO might cause a garbage collection, which
- * might change weak_ptr_list.  Must re-load weak_ptr_list each time
- * around the loop.
- */
-
-void
-finalizeWeakPointersNow(void)
-{
-  StgWeak *w;
-  
-  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) {
-           rts_evalIO(w->finalizer,NULL);
-       }
-    }
-  }
-} 
-
-/*
  * 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.
@@ -65,33 +31,27 @@ 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)
+scheduleFinalizers(Capability *cap, StgWeak *list)
 {
     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++;
-    }
-       
-    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));
+       // 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);
 
-    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++;
        }
 
@@ -106,13 +66,32 @@ 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,debugBelch("weak: batching %d finalizers\n", n));
+
+    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(RtsFlags.GcFlags.initialStkSize, 
-                      rts_apply(
-                          rts_apply(
+    t = createIOThread(cap, 
+                      RtsFlags.GcFlags.initialStkSize, 
+                      rts_apply(cap,
+                          rts_apply(cap,
                               (StgClosure *)runFinalizerBatch_closure,
-                              rts_mkInt(n)), 
+                              rts_mkInt(cap,n)), 
                           (StgClosure *)arr)
        );
-    scheduleThread(t);
+    scheduleThread(cap,t);
 }