#include "Rts.h"
#include "Hash.h"
#include "RtsUtils.h"
+#include "OSThreads.h"
#include "Storage.h"
#include "RtsAPI.h"
#include "RtsFlags.h"
+#include "OSThreads.h"
/* Comment from ADR's implementation in old RTS:
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.
void
initStablePtrTable(void)
{
- // Nothing to do:
- // the table will be allocated the first time makeStablePtr is
- // called, and we want the table to persist through multiple inits.
+ if (SPT_size > 0)
+ return;
+
+ SPT_size = INIT_SPT_SIZE;
+ stable_ptr_table = stgMallocBytes(SPT_size * sizeof(snEntry),
+ "initStablePtrTable");
+
+ /* we don't use index 0 in the stable name table, because that
+ * would conflict with the hash table lookup operations which
+ * return NULL if an entry isn't found in the hash table.
+ */
+ initFreeList(stable_ptr_table+1,INIT_SPT_SIZE-1,NULL);
+ addrToStableHash = allocHashTable();
+
+#ifdef THREADED_RTS
+ initMutex(&stable_mutex);
+#endif
}
/*
return q;
}
-StgWord
-lookupStableName(StgPtr p)
+static StgWord
+lookupStableName_(StgPtr p)
{
StgWord sn;
void* sn_tmp;
}
}
+StgWord
+lookupStableName(StgPtr p)
+{
+ StgWord res;
+
+ initStablePtrTable();
+ ACQUIRE_LOCK(&stable_mutex);
+ res = lookupStableName_(p);
+ RELEASE_LOCK(&stable_mutex);
+ return res;
+}
+
STATIC_INLINE void
freeStableName(snEntry *sn)
{
{
StgWord sn;
- sn = lookupStableName(p);
+ initStablePtrTable();
+ 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;
+
+ initStablePtrTable();
+ ACQUIRE_LOCK(&stable_mutex);
+
+ sn = &stable_ptr_table[(StgWord)sp];
ASSERT((StgWord)sp < SPT_size && sn->addr != NULL && sn->ref > 0);
if (sn->sn_obj == NULL && sn->ref == 0) {
freeStableName(sn);
}
+
+ RELEASE_LOCK(&stable_mutex);
}
void
enlargeStablePtrTable(void)
{
nat old_SPT_size = SPT_size;
-
- if (SPT_size == 0) {
- // 1st time
- SPT_size = INIT_SPT_SIZE;
- stable_ptr_table = stgMallocBytes(SPT_size * sizeof(snEntry),
- "enlargeStablePtrTable");
-
- /* we don't use index 0 in the stable name table, because that
- * would conflict with the hash table lookup operations which
- * return NULL if an entry isn't found in the hash table.
- */
- initFreeList(stable_ptr_table+1,INIT_SPT_SIZE-1,NULL);
- addrToStableHash = allocHashTable();
- }
- else {
+
// 2nd and subsequent times
- SPT_size *= 2;
- stable_ptr_table =
- stgReallocBytes(stable_ptr_table,
+ SPT_size *= 2;
+ stable_ptr_table =
+ stgReallocBytes(stable_ptr_table,
SPT_size * sizeof(snEntry),
"enlargeStablePtrTable");
- initFreeList(stable_ptr_table + old_SPT_size, old_SPT_size, NULL);
- }
+ initFreeList(stable_ptr_table + old_SPT_size, old_SPT_size, NULL);
}
/* -----------------------------------------------------------------------------