X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FWeak.c;h=fe2ae7415f0ae91dc0b032af195c417830186fb6;hb=b9d46a06dce3bf3bdeb805f35c35e0e68ab2f2d0;hp=1d97752aa2db05cabc51a54e0e1813a9d837c3d4;hpb=408918914b7fb14d91b01b8196e96771fab8eff1;p=ghc-hetmet.git

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index 1d97752..fe2ae74 100644
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.25 2002/06/19 12:01:28 simonmar Exp $
+ * $Id: Weak.c,v 1.29 2003/03/26 17:43:05 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -14,6 +14,7 @@
 #include "RtsFlags.h"
 #include "Weak.h"
 #include "Storage.h"
+#include "Schedule.h"
 #include "Prelude.h"
 #include "RtsAPI.h"
 
@@ -34,16 +35,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) {
 	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_mainEvalIO(w->finalizer,NULL);
+#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
 } 
 
 /*
@@ -99,6 +112,7 @@ scheduleFinalizers(StgWeak *list)
     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;