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

8191798: redo nested ThreadsListHandle to drop Threads_lock

Browse source 
Refactor Thread hazard ptrs and nested ThreadsLists into SafeThreadsListPtr.

Co-authored-by: Erik Osterlund <erik.osterlund@oracle.com>
Reviewed-by: dcubed, eosterlund, rehn
This commit is contained in:
Daniel D. Daugherty 2018-05-02 16:47:40 -04:00
parent 405f933513
commit 9a94336b7d
8 changed files with 411 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/hotspot/share/runtime/thread.cpp
View file

@ -243,7 +243,7 @@ Thread::Thread() {
// This initial value ==> never claimed.
_oops_do_parity = 0;
_threads_hazard_ptr = NULL;
_nested_threads_hazard_ptr = NULL;
_threads_list_ptr = NULL;
_nested_threads_hazard_ptr_cnt = 0;
_rcu_counter = 0;
@ -881,33 +881,11 @@ void Thread::print_on(outputStream* st) const {
st->print("tid=" INTPTR_FORMAT " ", p2i(this));
osthread()->print_on(st);
}
if (_threads_hazard_ptr != NULL) {
st->print("_threads_hazard_ptr=" INTPTR_FORMAT, p2i(_threads_hazard_ptr));
}
if (_nested_threads_hazard_ptr != NULL) {
print_nested_threads_hazard_ptrs_on(st);
}
ThreadsSMRSupport::print_info_on(this, st);
st->print(" ");
debug_only(if (WizardMode) print_owned_locks_on(st);)
}
void Thread::print_nested_threads_hazard_ptrs_on(outputStream* st) const {
assert(_nested_threads_hazard_ptr != NULL, "must be set to print");
if (EnableThreadSMRStatistics) {
st->print(", _nested_threads_hazard_ptr_cnt=%u", _nested_threads_hazard_ptr_cnt);
}
st->print(", _nested_threads_hazard_ptrs=");
for (NestedThreadsList* node = _nested_threads_hazard_ptr; node != NULL;
node = node->next()) {
if (node != _nested_threads_hazard_ptr) {
// First node does not need a comma-space separator.
st->print(", ");
}
st->print(INTPTR_FORMAT, p2i(node->t_list()));
}
}
// Thread::print_on_error() is called by fatal error handler. Don't use
// any lock or allocate memory.
void Thread::print_on_error(outputStream* st, char* buf, int buflen) const {
@ -930,12 +908,7 @@ void Thread::print_on_error(outputStream* st, char* buf, int buflen) const {
st->print(" [id=%d]", osthread()->thread_id());
}
if (_threads_hazard_ptr != NULL) {
st->print(" _threads_hazard_ptr=" INTPTR_FORMAT, p2i(_threads_hazard_ptr));
}
if (_nested_threads_hazard_ptr != NULL) {
print_nested_threads_hazard_ptrs_on(st);
}
ThreadsSMRSupport::print_info_on(this, st);
}
void Thread::print_value_on(outputStream* st) const {
@ -2995,12 +2968,7 @@ void JavaThread::print_on_error(outputStream* st, char *buf, int buflen) const {
p2i(stack_end()), p2i(stack_base()));
st->print("]");
if (_threads_hazard_ptr != NULL) {
st->print(" _threads_hazard_ptr=" INTPTR_FORMAT, p2i(_threads_hazard_ptr));
}
if (_nested_threads_hazard_ptr != NULL) {
print_nested_threads_hazard_ptrs_on(st);
}
ThreadsSMRSupport::print_info_on(this, st);
return;
}