fix for gcc 4.1.x

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

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index fe2ae74..f010395 100644 (file)
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.29 2003/03/26 17:43:05 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -10,6 +9,7 @@
 #include "PosixSource.h"
 #define COMPILING_RTS_MAIN
 #include "Rts.h"
+#include "RtsUtils.h"
 #include "SchedAPI.h"
 #include "RtsFlags.h"
 #include "Weak.h"
@@ -21,45 +21,6 @@
 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;
-  
-#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) {
-       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_mainLazyIO(w->finalizer,NULL);
-#endif
-       }
-    }
-  }
-#if defined(RTS_SUPPORTS_THREADS)
-  rts_unlock();
-#endif
-} 
-
-/*
  * 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.
@@ -75,7 +36,7 @@ finalizeWeakPointersNow(void)
  */
 
 void
-scheduleFinalizers(StgWeak *list)
+scheduleFinalizers(Capability *cap, StgWeak *list)
 {
     StgWeak *w;
     StgTSO *t;
@@ -109,9 +70,9 @@ scheduleFinalizers(StgWeak *list)
     // No finalizers to run?
     if (n == 0) return;
 
-    IF_DEBUG(weak,fprintf(stderr,"weak: batching %d finalizers\n", n));
+    IF_DEBUG(weak,debugBelch("weak: batching %d finalizers\n", n));
 
-    arr = (StgMutArrPtrs *)allocate(sizeofW(StgMutArrPtrs) + 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;
@@ -124,12 +85,13 @@ scheduleFinalizers(StgWeak *list)
        }
     }
 
-    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);
 }