oops, initialize atomic_modify_mutvar_mutex

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

diff --git a/ghc/rts/Stable.c b/ghc/rts/Stable.c
index a2829c6..09efb6a 100644 (file)
--- a/ghc/rts/Stable.c
+++ b/ghc/rts/Stable.c
@@ -17,6 +17,7 @@
 #include "Storage.h"
 #include "RtsAPI.h"
 #include "RtsFlags.h"
+#include "OSThreads.h"
 
 /* Comment from ADR's implementation in old RTS:
 
@@ -79,6 +80,10 @@ static snEntry *stable_ptr_free = NULL;
 
 static unsigned int SPT_size = 0;
 
+#ifdef THREADED_RTS
+static Mutex stable_mutex;
+#endif
+
 /* This hash table maps Haskell objects to stable names, so that every
  * call to lookupStableName on a given object will return the same
  * stable name.
@@ -140,6 +145,9 @@ initStablePtrTable(void)
     //
     // Also, getStablePtr is now called from __attribute__((constructor))
     // functions, so initialising things here wouldn't work anyway.
+#ifdef THREADED_RTS
+    initMutex(&stable_mutex);
+#endif
 }
 
 /*
@@ -163,8 +171,8 @@ removeIndirections(StgClosure* p)
   return q;
 }
 
-StgWord
-lookupStableName(StgPtr p)
+static StgWord
+lookupStableName_(StgPtr p)
 {
   StgWord sn;
   void* sn_tmp;
@@ -200,6 +208,16 @@ lookupStableName(StgPtr p)
   }
 }
 
+StgWord
+lookupStableName(StgPtr p)
+{
+    StgWord res;
+    ACQUIRE_LOCK(&stable_mutex);
+    res = lookupStableName_(p);
+    RELEASE_LOCK(&stable_mutex);
+    return res;
+}
+
 STATIC_INLINE void
 freeStableName(snEntry *sn)
 {
@@ -216,15 +234,21 @@ getStablePtr(StgPtr p)
 {
   StgWord sn;
 
-  sn = lookupStableName(p);
+  ACQUIRE_LOCK(&stable_mutex);
+  sn = lookupStableName_(p);
   stable_ptr_table[sn].ref++;
+  RELEASE_LOCK(&stable_mutex);
   return (StgStablePtr)(sn);
 }
 
 void
 freeStablePtr(StgStablePtr sp)
 {
-    snEntry *sn = &stable_ptr_table[(StgWord)sp];
+    snEntry *sn;
+
+    ACQUIRE_LOCK(&stable_mutex);
+
+    sn = &stable_ptr_table[(StgWord)sp];
     
     ASSERT((StgWord)sp < SPT_size  &&  sn->addr != NULL  &&  sn->ref > 0);
 
@@ -236,6 +260,8 @@ freeStablePtr(StgStablePtr sp)
     if (sn->sn_obj == NULL && sn->ref == 0) {
        freeStableName(sn);
     }
+
+    RELEASE_LOCK(&stable_mutex);
 }
 
 void