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

8264711: More runtime TRAPS cleanups

Browse source 
Reviewed-by: lfoltan, pchilanomate, dholmes, dcubed
This commit is contained in:
Harold Seigel 2021-04-08 12:13:19 +00:00
parent 3aec2d9647
commit af13c64f68
26 changed files with 84 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -431,7 +431,7 @@ void ObjectSynchronizer::enter(Handle obj, BasicLock* lock, JavaThread* current)
}
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
}
markWord mark = obj->mark();
@ -535,7 +535,7 @@ void ObjectSynchronizer::exit(oop object, BasicLock* lock, JavaThread* current)
// NOTE: must use heavy weight monitor to handle complete_exit/reenter()
intx ObjectSynchronizer::complete_exit(Handle obj, JavaThread* current) {
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
@ -549,7 +549,7 @@ intx ObjectSynchronizer::complete_exit(Handle obj, JavaThread* current) {
// NOTE: must use heavy weight monitor to handle complete_exit/reenter()
void ObjectSynchronizer::reenter(Handle obj, intx recursions, JavaThread* current) {
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
@ -575,7 +575,7 @@ void ObjectSynchronizer::jni_enter(Handle obj, JavaThread* current) {
// the current locking is from JNI instead of Java code
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
current->set_current_pending_monitor_is_from_java(false);
@ -596,7 +596,7 @@ void ObjectSynchronizer::jni_exit(oop obj, TRAPS) {
JavaThread* current = THREAD->as_Java_thread();
if (UseBiasedLocking) {
Handle h_obj(current, obj);
BiasedLocking::revoke(h_obj, current);
BiasedLocking::revoke(current, h_obj);
obj = h_obj();
}
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
@ -638,7 +638,7 @@ ObjectLocker::~ObjectLocker() {
int ObjectSynchronizer::wait(Handle obj, jlong millis, TRAPS) {
JavaThread* current = THREAD->as_Java_thread();
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
if (millis < 0) {
@ -664,7 +664,7 @@ int ObjectSynchronizer::wait(Handle obj, jlong millis, TRAPS) {
// correct and we have to wait until notified - so no interrupts or timeouts.
void ObjectSynchronizer::wait_uninterruptibly(Handle obj, JavaThread* current) {
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
// The ObjectMonitor* can't be async deflated because the _waiters
@ -677,7 +677,7 @@ void ObjectSynchronizer::wait_uninterruptibly(Handle obj, JavaThread* current) {
void ObjectSynchronizer::notify(Handle obj, TRAPS) {
JavaThread* current = THREAD->as_Java_thread();
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
@ -696,7 +696,7 @@ void ObjectSynchronizer::notify(Handle obj, TRAPS) {
void ObjectSynchronizer::notifyall(Handle obj, TRAPS) {
JavaThread* current = THREAD->as_Java_thread();
if (UseBiasedLocking) {
BiasedLocking::revoke(obj, current);
BiasedLocking::revoke(current, obj);
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
@ -858,7 +858,7 @@ intptr_t ObjectSynchronizer::FastHashCode(Thread* current, oop obj) {
if (SafepointSynchronize::is_at_safepoint()) {
BiasedLocking::revoke_at_safepoint(hobj);
} else {
BiasedLocking::revoke(hobj, current);
BiasedLocking::revoke(current->as_Java_thread(), hobj);
}
obj = hobj();
assert(!obj->mark().has_bias_pattern(), "biases should be revoked by now");
@ -985,7 +985,7 @@ intptr_t ObjectSynchronizer::identity_hash_value_for(Handle obj) {
bool ObjectSynchronizer::current_thread_holds_lock(JavaThread* current,
Handle h_obj) {
if (UseBiasedLocking) {
BiasedLocking::revoke(h_obj, current);
BiasedLocking::revoke(current, h_obj);
assert(!h_obj->mark().has_bias_pattern(), "biases should be revoked by now");
}
@ -1016,7 +1016,7 @@ JavaThread* ObjectSynchronizer::get_lock_owner(ThreadsList * t_list, Handle h_ob
if (SafepointSynchronize::is_at_safepoint()) {
BiasedLocking::revoke_at_safepoint(h_obj);
} else {
BiasedLocking::revoke(h_obj, JavaThread::current());
BiasedLocking::revoke(JavaThread::current(), h_obj);
}
assert(!h_obj->mark().has_bias_pattern(), "biases should be revoked by now");
}