/* -----------------------------------------------------------------------------
- * $Id: Stable.c,v 1.28 2004/08/13 13:10:45 simonmar Exp $
*
* (c) The GHC Team, 1998-2002
*
#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.
// Nothing to do:
// the table will be allocated the first time makeStablePtr is
// called, and we want the table to persist through multiple inits.
+ //
+ // Also, getStablePtr is now called from __attribute__((constructor))
+ // functions, so initialising things here wouldn't work anyway.
+#ifdef THREADED_RTS
+ initMutex(&stable_mutex);
+#endif
}
/*
return q;
}
-StgWord
-lookupStableName(StgPtr p)
+static StgWord
+lookupStableName_(StgPtr p)
{
StgWord sn;
+ void* sn_tmp;
if (stable_ptr_free == NULL) {
enlargeStablePtrTable();
*/
p = (StgPtr)removeIndirections((StgClosure*)p);
- (void *)sn = lookupHashTable(addrToStableHash,(W_)p);
+ sn_tmp = lookupHashTable(addrToStableHash,(W_)p);
+ sn = (StgWord)sn_tmp;
if (sn != 0) {
ASSERT(stable_ptr_table[sn].addr == p);
- IF_DEBUG(stable,fprintf(stderr,"cached stable name %d at %p\n",sn,p));
+ IF_DEBUG(stable,debugBelch("cached stable name %ld at %p\n",sn,p));
return sn;
} else {
sn = stable_ptr_free - stable_ptr_table;
- (P_)stable_ptr_free = stable_ptr_free->addr;
+ stable_ptr_free = (snEntry*)(stable_ptr_free->addr);
stable_ptr_table[sn].ref = 0;
stable_ptr_table[sn].addr = p;
stable_ptr_table[sn].sn_obj = NULL;
- /* IF_DEBUG(stable,fprintf(stderr,"new stable name %d at
- %p\n",sn,p)); */
+ /* IF_DEBUG(stable,debugBelch("new stable name %d at %p\n",sn,p)); */
/* add the new stable name to the hash table */
insertHashTable(addrToStableHash, (W_)p, (void *)sn);
}
}
+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)
{
{
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);
if (sn->sn_obj == NULL && sn->ref == 0) {
freeStableName(sn);
}
+
+ RELEASE_LOCK(&stable_mutex);
}
void
if (p->sn_obj == NULL) {
// StableName object is dead
freeStableName(p);
- IF_DEBUG(stable, fprintf(stderr,"GC'd Stable name %d\n",
- p - stable_ptr_table));
+ IF_DEBUG(stable, debugBelch("GC'd Stable name %ld\n",
+ p - stable_ptr_table));
continue;
} else {
- (StgClosure *)p->addr = isAlive((StgClosure *)p->addr);
- IF_DEBUG(stable, fprintf(stderr,"Stable name %d still alive at %p, ref %d\n", p - stable_ptr_table, p->addr, p->ref));
+ p->addr = (StgPtr)isAlive((StgClosure *)p->addr);
+ IF_DEBUG(stable, debugBelch("Stable name %ld still alive at %p, ref %ld\n", p - stable_ptr_table, p->addr, p->ref));
}
}
}