archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6699669: Hotspot server leaves synchronized block with monitor in bad state

Browse source 
Remove usage of _highest_lock field in Thread so that is_lock_owned won't depend on the correct update of that field.

Reviewed-by: never, dice, acorn
This commit is contained in:
Xiaobin Lu 2009-04-06 15:47:39 -07:00
parent e1b2c1c442
commit 62fa852746
8 changed files with 37 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hotspot/src/share/vm/runtime/thread.hpp
View file

@ -200,14 +200,6 @@ class Thread: public ThreadShadow {
friend class ThreadLocalStorage;
friend class GC_locker;
// In order for all threads to be able to use fast locking, we need to know the highest stack
// address of where a lock is on the stack (stacks normally grow towards lower addresses). This
// variable is initially set to NULL, indicating no locks are used by the thread. During the thread's
// execution, it will be set whenever locking can happen, i.e., when we call out to Java code or use
// an ObjectLocker. The value is never decreased, hence, it will over the lifetime of a thread
// approximate the real stackbase.
address _highest_lock; // Highest stack address where a JavaLock exist
ThreadLocalAllocBuffer _tlab; // Thread-local eden
int _vm_operation_started_count; // VM_Operation support
@ -400,18 +392,14 @@ public:
// Sweeper support
void nmethods_do();
// Fast-locking support
address highest_lock() const { return _highest_lock; }
void update_highest_lock(address base) { if (base > _highest_lock) _highest_lock = base; }
// Tells if adr belong to this thread. This is used
// for checking if a lock is owned by the running thread.
// Warning: the method can only be used on the running thread
// Fast lock support uses these methods
virtual bool lock_is_in_stack(address adr) const;
// Used by fast lock support
virtual bool is_lock_owned(address adr) const;
// Check if address is in the stack of the thread (not just for locks).
// Warning: the method can only be used on the running thread
bool is_in_stack(address adr) const;
// Sets this thread as starting thread. Returns failure if thread