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

8252980: comment only changes extracted from JDK-8247281

Browse source 
Reviewed-by: iklam, dholmes
This commit is contained in:
Daniel D. Daugherty 2020-09-09 23:35:17 +00:00
parent 433394203d
commit f9339616e1
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/hotspot/share/runtime/objectMonitor.cpp
View file

@ -706,9 +706,6 @@ void ObjectMonitor::EnterI(TRAPS) {
assert(_owner == Self, "invariant"); assert(_owner == Self, "invariant");
assert(object() != NULL, "invariant"); assert(object() != NULL, "invariant");
// I'd like to write:
// guarantee (((oop)(object()))->mark() == markWord::encode(this), "invariant") ;
// but as we're at a safepoint that's not safe.
UnlinkAfterAcquire(Self, &node); UnlinkAfterAcquire(Self, &node);
if (_succ == Self) _succ = NULL; if (_succ == Self) _succ = NULL;

14
src/hotspot/share/runtime/synchronizer.cpp
View file

@ -1892,17 +1892,17 @@ ObjectMonitor* ObjectSynchronizer::inflate(Thread* self, oop object,
// CASE: stack-locked // CASE: stack-locked
// Could be stack-locked either by this thread or by some other thread. // Could be stack-locked either by this thread or by some other thread.
// //
// Note that we allocate the objectmonitor speculatively, _before_ attempting // Note that we allocate the ObjectMonitor speculatively, _before_ attempting
// to install INFLATING into the mark word. We originally installed INFLATING, // to install INFLATING into the mark word. We originally installed INFLATING,
// allocated the objectmonitor, and then finally STed the address of the // allocated the ObjectMonitor, and then finally STed the address of the
// objectmonitor into the mark. This was correct, but artificially lengthened // ObjectMonitor into the mark. This was correct, but artificially lengthened
// the interval in which INFLATED appeared in the mark, thus increasing // the interval in which INFLATING appeared in the mark, thus increasing
// the odds of inflation contention. // the odds of inflation contention.
// //
// We now use per-thread private objectmonitor free lists. // We now use per-thread private ObjectMonitor free lists.
// These list are reprovisioned from the global free list outside the // These list are reprovisioned from the global free list outside the
// critical INFLATING...ST interval. A thread can transfer // critical INFLATING...ST interval. A thread can transfer
// multiple objectmonitors en-mass from the global free list to its local free list. // multiple ObjectMonitors en-mass from the global free list to its local free list.
// This reduces coherency traffic and lock contention on the global free list. // This reduces coherency traffic and lock contention on the global free list.
// Using such local free lists, it doesn't matter if the om_alloc() call appears // Using such local free lists, it doesn't matter if the om_alloc() call appears
// before or after the CAS(INFLATING) operation. // before or after the CAS(INFLATING) operation.
@ -1912,7 +1912,7 @@ ObjectMonitor* ObjectSynchronizer::inflate(Thread* self, oop object,
if (mark.has_locker()) { if (mark.has_locker()) {
ObjectMonitor* m = om_alloc(self); ObjectMonitor* m = om_alloc(self);
// Optimistically prepare the objectmonitor - anticipate successful CAS // Optimistically prepare the ObjectMonitor - anticipate successful CAS
// We do this before the CAS in order to minimize the length of time // We do this before the CAS in order to minimize the length of time
// in which INFLATING appears in the mark. // in which INFLATING appears in the mark.
m->Recycle(); m->Recycle();