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

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index f216f62..787c9e4 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.27 2003/01/25 15:54:50 wolfgang Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -10,10 +9,12 @@
 #include "PosixSource.h"
 #define COMPILING_RTS_MAIN
 #include "Rts.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"
 
@@ -34,28 +35,20 @@ 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));
+	SET_HDR(w, &stg_DEAD_WEAK_info, w->header.prof.ccs);
+	IF_DEBUG(weak,debugBelch("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_evalLazyIO(w->finalizer,NULL);
 	    rts_unlock();
 	    rts_lock();
-#else
-	    rts_mainEvalIO(w->finalizer,NULL);
-#endif
 	}
     }
   }
-#if defined(RTS_SUPPORTS_THREADS)
   rts_unlock();
-#endif
 } 
 
 /*
@@ -108,11 +101,12 @@ 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);
     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;