mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-28 16:50:10 +00:00
8380872: Remove lingering comments about the removed stack locking
Reviewed-by: aboldtch, dholmes
This commit is contained in:
parent
1a99655554
commit
22bbf900e1
@ -152,7 +152,7 @@ inline Assembler::AvxVectorLen C2_MacroAssembler::vector_length_encoding(int vle
|
||||
|
||||
// Because the transitions from emitted code to the runtime
|
||||
// monitorenter/exit helper stubs are so slow it's critical that
|
||||
// we inline both the stack-locking fast path and the inflated fast path.
|
||||
// we inline both the lock-stack fast path and the inflated fast path.
|
||||
//
|
||||
// See also: cmpFastLock and cmpFastUnlock.
|
||||
//
|
||||
|
||||
@ -54,7 +54,6 @@
|
||||
//
|
||||
// - the two lock bits are used to describe three states: locked/unlocked and monitor.
|
||||
//
|
||||
// [ptr | 00] locked ptr points to real header on stack (stack-locking in use)
|
||||
// [header | 00] locked locked regular object header (fast-locking in use)
|
||||
// [header | 01] unlocked regular object header
|
||||
// [ptr | 10] monitor inflated lock (header is swapped out, UseObjectMonitorTable == false)
|
||||
|
||||
@ -89,10 +89,8 @@ class ObjectWaiter : public CHeapObj<mtThread> {
|
||||
}
|
||||
};
|
||||
|
||||
// The ObjectMonitor class implements the heavyweight version of a
|
||||
// JavaMonitor. The lightweight BasicLock/stack lock version has been
|
||||
// inflated into an ObjectMonitor. This inflation is typically due to
|
||||
// contention or use of Object.wait().
|
||||
// The ObjectMonitor class implements the heavyweight version of a JavaMonitor.
|
||||
// This inflation is typically due to contention or use of Object.wait().
|
||||
//
|
||||
// WARNING: This is a very sensitive and fragile class. DO NOT make any
|
||||
// changes unless you are fully aware of the underlying semantics.
|
||||
|
||||
@ -830,8 +830,7 @@ void ObjectSynchronizer::owned_monitors_iterate_filtered(MonitorClosure* closure
|
||||
});
|
||||
}
|
||||
|
||||
// Iterate ObjectMonitors where the owner == thread; this does NOT include
|
||||
// ObjectMonitors where owner is set to a stack-lock address in thread.
|
||||
// Iterate ObjectMonitors where the owner == thread.
|
||||
void ObjectSynchronizer::owned_monitors_iterate(MonitorClosure* closure, JavaThread* thread) {
|
||||
int64_t key = ObjectMonitor::owner_id_from(thread);
|
||||
auto thread_filter = [&](ObjectMonitor* monitor) { return monitor->owner() == key; };
|
||||
@ -1964,12 +1963,10 @@ ObjectMonitor* ObjectSynchronizer::inflate_into_object_header(oop object, Object
|
||||
const markWord mark = object->mark_acquire();
|
||||
|
||||
// The mark can be in one of the following states:
|
||||
// * inflated - Just return if using stack-locking.
|
||||
// If using fast-locking and the ObjectMonitor owner
|
||||
// is anonymous and the locking_thread owns the
|
||||
// object lock, then we make the locking_thread
|
||||
// the ObjectMonitor owner and remove the lock from
|
||||
// the locking_thread's lock stack.
|
||||
// * inflated - If the ObjectMonitor owner is anonymous and the
|
||||
// locking_thread owns the object lock, then we make the
|
||||
// locking_thread the ObjectMonitor owner and remove the
|
||||
// lock from the locking_thread's lock stack.
|
||||
// * fast-locked - Coerce it to inflated from fast-locked.
|
||||
// * unlocked - Aggressively inflate the object.
|
||||
|
||||
|
||||
@ -276,9 +276,6 @@ void VM_ThreadDump::doit_epilogue() {
|
||||
}
|
||||
|
||||
// Hash table of int64_t to a list of ObjectMonitor* owned by the JavaThread.
|
||||
// The JavaThread's owner key is either a JavaThread* or a stack lock
|
||||
// address in the JavaThread so we use "int64_t".
|
||||
//
|
||||
class ObjectMonitorsDump : public MonitorClosure, public ObjectMonitorsView {
|
||||
private:
|
||||
static unsigned int ptr_hash(int64_t const& s1) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user