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

8236035: refactor ObjectMonitor::set_owner() and _owner field setting

Browse source 
Reviewed-by: dholmes, kbarrett, rehn
This commit is contained in:
Daniel D. Daugherty 2020-02-05 11:39:52 -05:00
parent b9e3a4efef
commit 8ff24c55ef
5 changed files with 95 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -240,7 +240,7 @@ bool ObjectSynchronizer::quick_enter(oop obj, Thread* self,
// and last are the inflated Java Monitor (ObjectMonitor) checks.
lock->set_displaced_header(markWord::unused_mark());
if (owner == NULL && Atomic::replace_if_null(&(m->_owner), self)) {
if (owner == NULL && m->try_set_owner_from(NULL, self) == NULL) {
assert(m->_recursions == 0, "invariant");
return true;
}
@ -1404,7 +1404,7 @@ ObjectMonitor* ObjectSynchronizer::inflate(Thread* self,
// Note that a thread can inflate an object
// that it has stack-locked -- as might happen in wait() -- directly
// with CAS. That is, we can avoid the xchg-NULL .... ST idiom.
m->set_owner(mark.locker());
m->set_owner_from(NULL, mark.locker());
m->set_object(object);
// TODO-FIXME: assert BasicLock->dhw != 0.