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

8251302: Create dedicated OopStorages for Management and Jvmti

Browse source 
Reviewed-by: sspitsyn, dholmes
This commit is contained in:
Coleen Phillimore 2020-08-11 07:29:45 -04:00
parent 28f963f6fc
commit b16a01bb67
7 changed files with 49 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/hotspot/share/services/threadService.cpp
View file

@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/systemDictionary.hpp"
#include "gc/shared/oopStorageSet.hpp"
#include "memory/allocation.hpp"
#include "memory/heapInspection.hpp"
#include "memory/oopFactory.hpp"
@ -67,6 +68,9 @@ ThreadDumpResult* ThreadService::_threaddump_list = NULL;
static const int INITIAL_ARRAY_SIZE = 10;
// OopStorage for thread stack sampling
static OopStorage* _thread_service_storage = NULL;
void ThreadService::init() {
EXCEPTION_MARK;
@ -95,6 +99,9 @@ void ThreadService::init() {
}
_thread_allocated_memory_enabled = true; // Always on, so enable it
// Initialize OopStorage for thread stack sampling walking
_thread_service_storage = OopStorageSet::create_strong("ThreadService OopStorage");
}
void ThreadService::reset_peak_thread_count() {
@ -563,7 +570,7 @@ ThreadsList* ThreadDumpResult::t_list() {
StackFrameInfo::StackFrameInfo(javaVFrame* jvf, bool with_lock_info) {
_method = jvf->method();
_bci = jvf->bci();
_class_holder = OopHandle(Universe::vm_global(), _method->method_holder()->klass_holder());
_class_holder = OopHandle(_thread_service_storage, _method->method_holder()->klass_holder());
_locked_monitors = NULL;
if (with_lock_info) {
Thread* current_thread = Thread::current();
@ -576,7 +583,7 @@ StackFrameInfo::StackFrameInfo(javaVFrame* jvf, bool with_lock_info) {
for (int i = 0; i < length; i++) {
MonitorInfo* monitor = list->at(i);
assert(monitor->owner() != NULL, "This monitor must have an owning object");
_locked_monitors->append(OopHandle(Universe::vm_global(), monitor->owner()));
_locked_monitors->append(OopHandle(_thread_service_storage, monitor->owner()));
}
}
}
@ -585,11 +592,11 @@ StackFrameInfo::StackFrameInfo(javaVFrame* jvf, bool with_lock_info) {
StackFrameInfo::~StackFrameInfo() {
if (_locked_monitors != NULL) {
for (int i = 0; i < _locked_monitors->length(); i++) {
_locked_monitors->at(i).release(Universe::vm_global());
_locked_monitors->at(i).release(_thread_service_storage);
}
delete _locked_monitors;
}
_class_holder.release(Universe::vm_global());
_class_holder.release(_thread_service_storage);
}
void StackFrameInfo::metadata_do(void f(Metadata*)) {
@ -640,7 +647,7 @@ ThreadStackTrace::ThreadStackTrace(JavaThread* t, bool with_locked_monitors) {
}
void ThreadStackTrace::add_jni_locked_monitor(oop object) {
_jni_locked_monitors->append(OopHandle(Universe::vm_global(), object));
_jni_locked_monitors->append(OopHandle(_thread_service_storage, object));
}
ThreadStackTrace::~ThreadStackTrace() {
@ -650,7 +657,7 @@ ThreadStackTrace::~ThreadStackTrace() {
delete _frames;
if (_jni_locked_monitors != NULL) {
for (int i = 0; i < _jni_locked_monitors->length(); i++) {
_jni_locked_monitors->at(i).release(Universe::vm_global());
_jni_locked_monitors->at(i).release(_thread_service_storage);
}
delete _jni_locked_monitors;
}
@ -834,13 +841,13 @@ ThreadConcurrentLocks::ThreadConcurrentLocks(JavaThread* thread) {
ThreadConcurrentLocks::~ThreadConcurrentLocks() {
for (int i = 0; i < _owned_locks->length(); i++) {
_owned_locks->at(i).release(Universe::vm_global());
_owned_locks->at(i).release(_thread_service_storage);
}
delete _owned_locks;
}
void ThreadConcurrentLocks::add_lock(instanceOop o) {
_owned_locks->append(OopHandle(Universe::vm_global(), o));
_owned_locks->append(OopHandle(_thread_service_storage, o));
}
ThreadStatistics::ThreadStatistics() {
@ -857,7 +864,7 @@ oop ThreadSnapshot::threadObj() const { return _threadObj.resolve(); }
void ThreadSnapshot::initialize(ThreadsList * t_list, JavaThread* thread) {
_thread = thread;
oop threadObj = thread->threadObj();
_threadObj = OopHandle(Universe::vm_global(), threadObj);
_threadObj = OopHandle(_thread_service_storage, threadObj);
ThreadStatistics* stat = thread->get_thread_stat();
_contended_enter_ticks = stat->contended_enter_ticks();
@ -910,10 +917,10 @@ void ThreadSnapshot::initialize(ThreadsList * t_list, JavaThread* thread) {
}
if (blocker_object != NULL) {
_blocker_object = OopHandle(Universe::vm_global(), blocker_object);
_blocker_object = OopHandle(_thread_service_storage, blocker_object);
}
if (blocker_object_owner != NULL) {
_blocker_object_owner = OopHandle(Universe::vm_global(), blocker_object_owner);
_blocker_object_owner = OopHandle(_thread_service_storage, blocker_object_owner);
}
}
@ -921,9 +928,9 @@ oop ThreadSnapshot::blocker_object() const { return _blocker_object.re
oop ThreadSnapshot::blocker_object_owner() const { return _blocker_object_owner.resolve(); }
ThreadSnapshot::~ThreadSnapshot() {
_blocker_object.release(Universe::vm_global());
_blocker_object_owner.release(Universe::vm_global());
_threadObj.release(Universe::vm_global());
_blocker_object.release(_thread_service_storage);
_blocker_object_owner.release(_thread_service_storage);
_threadObj.release(_thread_service_storage);
delete _stack_trace;
delete _concurrent_locks;