OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natObject.cc (heavy_lock): Moved fields old_client_data, old_finalization_proc near beginning. 

2001-10-15  Hans Boehm <Hans_Boehm@hp.com>

	* java/lang/natObject.cc (heavy_lock): Moved fields
	old_client_data, old_finalization_proc near beginning.
	(heavy_lock_finalization_proc): Now inline; changed type of
	argument.
	(JV_SYNC_TABLE_SZ): Now 2048.
	(mp): New global.
	(spin): `mp' now global.
	(heavy_lock_obj_finalization_proc): Updated to correctly handle
	heavy lock finalization.
	(remove_all_heavy): New function.
	(maybe_remove_all_heavy): Likewise.
	(_Jv_MonitorEnter): Throw exception if object is NULL.
	(_Jv_MonitorExit): Likewise.  Also, clear long lists of unlocked
	heavy locks.
	* include/jvm.h (_Jv_AllocTraceTwo): Declare.
	* nogc.cc (_Jv_AllocTraceTwo): New function.
	* boehm.cc (trace_two_vtable): New global.
	(_Jv_AllocTraceTwo): New function.

From-SVN: r46271
This commit is contained in:
Hans Boehm 2001-10-15 22:42:42 +00:00 committed by Tom Tromey
parent c83303d8a4
commit 3a8da0244a
5 changed files with 228 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libjava/ChangeLog
View File

@ -1,3 +1,24 @@
2001-10-15 Hans Boehm <Hans_Boehm@hp.com>
* java/lang/natObject.cc (heavy_lock): Moved fields
old_client_data, old_finalization_proc near beginning.
(heavy_lock_finalization_proc): Now inline; changed type of
argument.
(JV_SYNC_TABLE_SZ): Now 2048.
(mp): New global.
(spin): `mp' now global.
(heavy_lock_obj_finalization_proc): Updated to correctly handle
heavy lock finalization.
(remove_all_heavy): New function.
(maybe_remove_all_heavy): Likewise.
(_Jv_MonitorEnter): Throw exception if object is NULL.
(_Jv_MonitorExit): Likewise. Also, clear long lists of unlocked
heavy locks.
* include/jvm.h (_Jv_AllocTraceTwo): Declare.
* nogc.cc (_Jv_AllocTraceTwo): New function.
* boehm.cc (trace_two_vtable): New global.
(_Jv_AllocTraceTwo): New function.
2001-10-15 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.

20
libjava/boehm.cc
View File

@ -531,7 +531,7 @@ static _Jv_VTable trace_one_vtable = {
(void *)(2 * sizeof(void *)),
// descriptor; scan 2 words incl. vtable ptr.
// Least significant bits must be zero to
// identify this as a lenght descriptor
// identify this as a length descriptor
{0} // First method
};
@ -541,6 +541,24 @@ _Jv_AllocTraceOne (jsize size /* includes vtable slot */)
return GC_GCJ_MALLOC (size, &trace_one_vtable);
}
// Ditto for two words.
// the first field (beyond the fake vtable pointer) to be traced.
// Eventually this should probably be generalized.
static _Jv_VTable trace_two_vtable =
{
0, // class pointer
(void *)(3 * sizeof(void *)),
// descriptor; scan 3 words incl. vtable ptr.
{0} // First method
};
void *
_Jv_AllocTraceTwo (jsize size /* includes vtable slot */)
{
return GC_GCJ_MALLOC (size, &trace_two_vtable);
}
#endif /* JV_HASH_SYNCHRONIZATION */
void

2
libjava/include/jvm.h
View File

@ -144,6 +144,8 @@ void _Jv_ThrowNoMemory() __attribute__((__noreturn__));
/* Allocate an object with a single pointer. The first word is reserved
for the GC, and the second word is the traced pointer. */
void *_Jv_AllocTraceOne (jsize size /* incl. reserved slot */);
/* Ditto, but for two traced pointers. */
void *_Jv_AllocTraceTwo (jsize size /* incl. reserved slot */);
/* Initialize the GC. */
void _Jv_InitGC (void);
/* Register a finalizer. */

210
libjava/java/lang/natObject.cc
View File

@ -466,15 +466,20 @@ keep_live(obj_addr_t p)
struct heavy_lock {
void * reserved_for_gc;
struct heavy_lock *next; // Hash chain link.
// The only field traced by GC.
// Traced by GC.
void * old_client_data; // The only other field traced by GC.
GC_finalization_proc old_finalization_proc;
obj_addr_t address; // Object to which this lock corresponds.
// Should not be traced by GC.
// Cleared as heavy_lock is destroyed.
// Together with the rest of the hevy lock
// chain, this is protected by the lock
// bit in the hash table entry to which
// the chain is attached.
_Jv_SyncInfo si;
// The remaining fields save prior finalization info for
// the object, which we needed to replace in order to arrange
// for cleanup of the lock structure.
GC_finalization_proc old_finalization_proc;
void * old_client_data;
};
#ifdef LOCK_DEBUG
@ -489,11 +494,11 @@ print_hl_list(heavy_lock *hl)
#if defined (_Jv_HaveCondDestroy) || defined (_Jv_HaveMutexDestroy)
// If we have to run a destructor for a sync_info member, then this
// function is registered as a finalizer for the sync_info.
static void
heavy_lock_finalization_proc (jobject obj)
// function could be registered as a finalizer for the sync_info.
// In fact, we now only invoke it explicitly.
static inline void
heavy_lock_finalization_proc (heavy_lock *hl)
{
heavy_lock *hl = (heavy_lock *) obj;
#if defined (_Jv_HaveCondDestroy)
_Jv_CondDestroy (&hl->si.condition);
#endif
@ -567,19 +572,34 @@ struct hash_entry {
// by lockbit for he. Locks may
// remain allocated here even if HEAVY
// is not set and heavy_count is 0.
// If a lightweight and hevyweight lock
// If a lightweight and heavyweight lock
// correspond to the same address, the
// lightweight lock is the right one.
};
#ifndef JV_SYNC_TABLE_SZ
# define JV_SYNC_TABLE_SZ 1024
# define JV_SYNC_TABLE_SZ 2048
#endif
hash_entry light_locks[JV_SYNC_TABLE_SZ];
#define JV_SYNC_HASH(p) (((long)p ^ ((long)p >> 10)) % JV_SYNC_TABLE_SZ)
// Note that the light_locks table is scanned conservatively by the
// collector. It is essential the the heavy_locks field is scanned.
// Currently the address field may or may not cause the associated object
// to be retained, depending on whether flag bits are set.
// This means that we can conceivable get an unexpected deadlock if
// 1) Object at address A is locked.
// 2) The client drops A without unlocking it.
// 3) Flag bits in the address entry are set, so the collector reclaims
// the object at A.
// 4) A is reallocated, and an attempt is made to lock the result.
// This could be fixed by scanning light_locks in a more customized
// manner that ignores the flag bits. But it can only happen with hand
// generated semi-illegal .class files, and then it doesn't present a
// security hole.
#ifdef LOCK_DEBUG
void print_he(hash_entry *he)
{
@ -593,6 +613,8 @@ hash_entry light_locks[JV_SYNC_TABLE_SZ];
}
#endif /* LOCK_DEBUG */
static bool mp = false; // Known multiprocesssor.
// Wait for roughly 2^n units, touching as little memory as possible.
static void
spin(unsigned n)
@ -604,7 +626,6 @@ spin(unsigned n)
const unsigned MAX_SLEEP_USECS = 200000;
static unsigned spin_limit = 0;
static unsigned yield_limit = YIELDS;
static bool mp = false;
static bool spin_initialized = false;
if (!spin_initialized)
@ -675,9 +696,29 @@ heavy_lock_obj_finalization_proc (void *obj, void *cd)
{
heavy_lock *hl = (heavy_lock *)cd;
obj_addr_t addr = (obj_addr_t)obj;
GC_finalization_proc old_finalization_proc = hl -> old_finalization_proc;
void * old_client_data = hl -> old_client_data;
hash_entry *he = light_locks + JV_SYNC_HASH(addr);
obj_addr_t he_address = (he -> address & ~LOCKED);
// Acquire lock bit immediately. It's possible that the hl was already
// destroyed while we were waiting for the finalizer to run. If it
// was, the address field was set to zero. The address filed access is
// protected by the lock bit to ensure that we do this exactly once.
// The lock bit also protects updates to the objects finalizer.
while (!compare_and_swap(&(he -> address), he_address, he_address|LOCKED ))
{
// Hash table entry is currently locked. We can't safely
// touch the list of heavy locks.
wait_unlocked(he);
he_address = (he -> address & ~LOCKED);
}
if (0 == hl -> address)
{
// remove_all_heavy destroyed hl, and took care of the real finalizer.
release_set(&(he -> address), he_address);
return;
}
assert(hl -> address == addr);
GC_finalization_proc old_finalization_proc = hl -> old_finalization_proc;
if (old_finalization_proc != 0)
{
// We still need to run a real finalizer. In an idealized
@ -686,11 +727,16 @@ heavy_lock_obj_finalization_proc (void *obj, void *cd)
// ourselves as the only finalizer, and simply run the real one.
// Thus we don't clean up the lock yet, but we're likely to do so
// on the next GC cycle.
// It's OK if remove_all_heavy actually destroys the heavy lock,
// since we've updated old_finalization_proc, and thus the user's
// finalizer won't be rerun.
void * old_client_data = hl -> old_client_data;
hl -> old_finalization_proc = 0;
hl -> old_client_data = 0;
# ifdef HAVE_BOEHM_GC
GC_REGISTER_FINALIZER_NO_ORDER(obj, heavy_lock_obj_finalization_proc, cd, 0, 0);
# endif
release_set(&(he -> address), he_address);
old_finalization_proc(obj, old_client_data);
}
else
@ -698,36 +744,102 @@ heavy_lock_obj_finalization_proc (void *obj, void *cd)
// The object is really dead, although it's conceivable that
// some thread may still be in the process of releasing the
// heavy lock. Unlink it and, if necessary, register a finalizer
// to distroy sync_info.
hash_entry *he = light_locks + JV_SYNC_HASH(addr);
obj_addr_t address = (he -> address & ~LOCKED);
while (!compare_and_swap(&(he -> address), address, address | LOCKED ))
{
// Hash table entry is currently locked. We can't safely touch
// touch the list of heavy locks.
wait_unlocked(he);
address = (he -> address & ~LOCKED);
}
unlink_heavy(addr, light_locks + JV_SYNC_HASH(addr));
release_set(&(he -> address), address);
// to destroy sync_info.
unlink_heavy(addr, he);
hl -> address = 0; // Dont destroy it again.
release_set(&(he -> address), he_address);
# if defined (_Jv_HaveCondDestroy) || defined (_Jv_HaveMutexDestroy)
// Register a finalizer, yet again.
hl->si.init = true;
_Jv_RegisterFinalizer (hl, heavy_lock_finalization_proc);
// Make sure lock is not held and then destroy condvar and mutex.
_Jv_MutexLock(&(hl->si.mutex));
_Jv_MutexUnlock(&(hl->si.mutex));
heavy_lock_finalization_proc (hl);
# endif
}
}
// We hold the lock on he, and heavy_count is 0.
// Release the lock by replacing the address with new_address_val.
// Remove all heavy locks on the list. Note that the only possible way
// in which a lock may still be in use is if it's in the process of
// being unlocked.
static void
remove_all_heavy (hash_entry *he, obj_addr_t new_address_val)
{
assert(he -> heavy_count == 0);
assert(he -> address & LOCKED);
heavy_lock *hl = he -> heavy_locks;
he -> heavy_locks = 0;
// We would really like to release the lock bit here. Unfortunately, that
// Creates a race between or finalizer removal, and the potential
// reinstallation of a new finalizer as a new heavy lock is created.
// This may need to be revisited.
for(; 0 != hl; hl = hl->next)
{
obj_addr_t obj = hl -> address;
assert(0 != obj); // If this was previously finalized, it should no
// longer appear on our list.
hl -> address = 0; // Finalization proc might still see it after we
// finish.
GC_finalization_proc old_finalization_proc = hl -> old_finalization_proc;
void * old_client_data = hl -> old_client_data;
# ifdef HAVE_BOEHM_GC
// Remove our finalization procedure.
// Reregister the clients if applicable.
GC_REGISTER_FINALIZER_NO_ORDER((GC_PTR)obj, old_finalization_proc,
old_client_data, 0, 0);
// Note that our old finalization procedure may have been
// previously determined to be runnable, and may still run.
// FIXME - direct dependency on boehm GC.
# endif
# if defined (_Jv_HaveCondDestroy) || defined (_Jv_HaveMutexDestroy)
// Wait for a possible lock holder to finish unlocking it.
// This is only an issue if we have to explicitly destroy the mutex
// or possibly if we have to destroy a condition variable that is
// still being notified.
_Jv_MutexLock(&(hl->si.mutex));
_Jv_MutexUnlock(&(hl->si.mutex));
heavy_lock_finalization_proc (hl);
# endif
}
release_set(&(he -> address), new_address_val);
}
// We hold the lock on he and heavy_count is 0.
// We release it by replacing the address field with new_address_val.
// Remove all heavy locks on the list if the list is sufficiently long.
// This is called periodically to avoid very long lists of heavy locks.
// This seems to otherwise become an issue with SPECjbb, for example.
static inline void
maybe_remove_all_heavy (hash_entry *he, obj_addr_t new_address_val)
{
static const int max_len = 5;
heavy_lock *hl = he -> heavy_locks;
for (int i = 0; i < max_len; ++i)
{
if (0 == hl)
{
release_set(&(he -> address), new_address_val);
return;
}
hl = hl -> next;
}
remove_all_heavy(he, new_address_val);
}
// Allocate a new heavy lock for addr, returning its address.
// Assumes we already have the hash_entry locked, and there
// is currently no lightweight or allocated lock for addr.
// We register a finalizer for addr, which is responsible for
// removing the heavy lock when addr goes away, in addition
// to the responsibilities of any prior finalizer.
// This unfortunately holds the lock bit for the hash entry while it
// allocates two objects (on for the finalizer).
// It would be nice to avoid that somehow ...
static heavy_lock *
alloc_heavy(obj_addr_t addr, hash_entry *he)
{
heavy_lock * hl = (heavy_lock *) _Jv_AllocTraceOne(sizeof (heavy_lock));
heavy_lock * hl = (heavy_lock *) _Jv_AllocTraceTwo(sizeof (heavy_lock));
hl -> address = addr;
_Jv_MutexInit (&(hl -> si.mutex));
@ -770,6 +882,14 @@ _Jv_MonitorEnter (jobject obj)
unsigned count;
const unsigned N_SPINS = 18;
// We need to somehow check that addr is not NULL on the fast path.
// A very predictable
// branch on a register value is probably cheaper than dereferencing addr.
// We could also permanently lock the NULL entry in the hash table.
// But it's not clear that's cheaper either.
if (__builtin_expect(!addr, false))
throw new java::lang::NullPointerException;
assert(!(addr & FLAGS));
retry:
if (__builtin_expect(compare_and_swap(&(he -> address),
@ -912,10 +1032,11 @@ retry:
// Unfortunately, it turns out we always need to read the address
// first. Even if we are going to update it with compare_and_swap,
// we need to reset light_thr_id, and that's not safe unless we know
// know that we hold the lock.
// that we hold the lock.
address = he -> address;
// First the (relatively) fast cases:
if (__builtin_expect(light_thr_id == self, true))
// Above must fail if addr == 0 .
{
count = he -> light_count;
if (__builtin_expect((address & ~HEAVY) == addr, true))
@ -946,6 +1067,8 @@ retry:
}
else
{
if (__builtin_expect(!addr, false))
throw new java::lang::NullPointerException;
if ((address & ~(HEAVY | REQUEST_CONVERSION)) == addr)
{
# ifdef LOCK_DEBUG
@ -1034,15 +1157,38 @@ retry:
count = he -> heavy_count;
assert(count > 0);
--count;
if (0 == count) address &= ~HEAVY;
he -> heavy_count = count;
release_set(&(he -> address), address);
if (0 == count)
{
const unsigned test_freq = 16; // Power of 2
static volatile unsigned counter = 0;
unsigned my_counter = counter;
counter = my_counter + 1;
if (my_counter%test_freq == 0)
{
// Randomize the interval length a bit.
counter = my_counter + (my_counter >> 4) % (test_freq/2);
// Unlock mutex first, to avoid self-deadlock, or worse.
_Jv_MutexUnlock(&(hl->si.mutex));
maybe_remove_all_heavy(he, address &~HEAVY);
// release lock bit, preserving
// REQUEST_CONVERSION
// and object address.
_Jv_MutexUnlock(&(hl->si.mutex));
}
else
{
release_set(&(he -> address), address &~HEAVY);
_Jv_MutexUnlock(&(hl->si.mutex));
// Unlock after releasing the lock bit, so that
// we don't switch to another thread prematurely.
}
}
else
{
release_set(&(he -> address), address);
_Jv_MutexUnlock(&(hl->si.mutex));
}
keep_live(addr);
}

8
libjava/nogc.cc
View File

@ -146,4 +146,12 @@ _Jv_AllocTraceOne (jsize size /* includes vtable slot */)
if (!obj) _Jv_ThrowNoMemory();
return result;
}
void *
_Jv_AllocTraceTwo (jsize size /* includes vtable slot */)
{
ptr_t obj = calloc(size, 1);
if (!obj) _Jv_ThrowNoMemory();
return result;
}
#endif /* JV_HASH_SYNCHRONIZATION */