mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-18 01:54:47 +02:00
Merge
This commit is contained in:
Alejandro Murillo
commit
45b6e4a1ca
523 changed files with 24469 additions and 7479 deletions
|
|
@ -35,6 +35,7 @@
|
|||
#include "compiler/compileTask.hpp"
|
||||
#include "gc/shared/gcId.hpp"
|
||||
#include "gc/shared/gcLocker.inline.hpp"
|
||||
#include "gc/shared/referencePendingListLocker.hpp"
|
||||
#include "gc/shared/workgroup.hpp"
|
||||
#include "interpreter/interpreter.hpp"
|
||||
#include "interpreter/linkResolver.hpp"
|
||||
|
|
@ -44,6 +45,7 @@
|
|||
#include "logging/logConfiguration.hpp"
|
||||
#include "memory/metaspaceShared.hpp"
|
||||
#include "memory/oopFactory.hpp"
|
||||
#include "memory/resourceArea.hpp"
|
||||
#include "memory/universe.inline.hpp"
|
||||
#include "oops/instanceKlass.hpp"
|
||||
#include "oops/objArrayOop.hpp"
|
||||
|
|
@ -68,7 +70,7 @@
|
|||
#include "runtime/java.hpp"
|
||||
#include "runtime/javaCalls.hpp"
|
||||
#include "runtime/jniPeriodicChecker.hpp"
|
||||
#include "runtime/logTimer.hpp"
|
||||
#include "runtime/timerTrace.hpp"
|
||||
#include "runtime/memprofiler.hpp"
|
||||
#include "runtime/mutexLocker.hpp"
|
||||
#include "runtime/objectMonitor.hpp"
|
||||
|
|
@ -152,7 +154,6 @@ void universe_post_module_init(); // must happen after call_initPhase2
|
|||
// Current thread is maintained as a thread-local variable
|
||||
THREAD_LOCAL_DECL Thread* Thread::_thr_current = NULL;
|
||||
#endif
|
||||
|
||||
// Class hierarchy
|
||||
// - Thread
|
||||
// - VMThread
|
||||
|
|
@ -791,10 +792,6 @@ void Thread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
|
|||
handle_area()->oops_do(f);
|
||||
}
|
||||
|
||||
void Thread::nmethods_do(CodeBlobClosure* cf) {
|
||||
// no nmethods in a generic thread...
|
||||
}
|
||||
|
||||
void Thread::metadata_handles_do(void f(Metadata*)) {
|
||||
// Only walk the Handles in Thread.
|
||||
if (metadata_handles() != NULL) {
|
||||
|
|
@ -2093,7 +2090,7 @@ void JavaThread::check_and_handle_async_exceptions(bool check_unsafe_error) {
|
|||
|
||||
if (log_is_enabled(Info, exceptions)) {
|
||||
ResourceMark rm;
|
||||
outputStream* logstream = LogHandle(exceptions)::info_stream();
|
||||
outputStream* logstream = Log(exceptions)::info_stream();
|
||||
logstream->print("Async. exception installed at runtime exit (" INTPTR_FORMAT ")", p2i(this));
|
||||
if (has_last_Java_frame()) {
|
||||
frame f = last_frame();
|
||||
|
|
@ -2827,8 +2824,6 @@ void JavaThread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf)
|
|||
}
|
||||
|
||||
void JavaThread::nmethods_do(CodeBlobClosure* cf) {
|
||||
Thread::nmethods_do(cf); // (super method is a no-op)
|
||||
|
||||
assert((!has_last_Java_frame() && java_call_counter() == 0) ||
|
||||
(has_last_Java_frame() && java_call_counter() > 0), "wrong java_sp info!");
|
||||
|
||||
|
|
@ -2887,7 +2882,9 @@ void JavaThread::print_thread_state() const {
|
|||
|
||||
// Called by Threads::print() for VM_PrintThreads operation
|
||||
void JavaThread::print_on(outputStream *st) const {
|
||||
st->print("\"%s\" ", get_thread_name());
|
||||
st->print_raw("\"");
|
||||
st->print_raw(get_thread_name());
|
||||
st->print_raw("\" ");
|
||||
oop thread_oop = threadObj();
|
||||
if (thread_oop != NULL) {
|
||||
st->print("#" INT64_FORMAT " ", java_lang_Thread::thread_id(thread_oop));
|
||||
|
|
@ -3301,6 +3298,7 @@ CodeCacheSweeperThread::CodeCacheSweeperThread()
|
|||
: JavaThread(&sweeper_thread_entry) {
|
||||
_scanned_nmethod = NULL;
|
||||
}
|
||||
|
||||
void CodeCacheSweeperThread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobClosure* cf) {
|
||||
JavaThread::oops_do(f, cld_f, cf);
|
||||
if (_scanned_nmethod != NULL && cf != NULL) {
|
||||
|
|
@ -3311,6 +3309,16 @@ void CodeCacheSweeperThread::oops_do(OopClosure* f, CLDClosure* cld_f, CodeBlobC
|
|||
}
|
||||
}
|
||||
|
||||
void CodeCacheSweeperThread::nmethods_do(CodeBlobClosure* cf) {
|
||||
JavaThread::nmethods_do(cf);
|
||||
if (_scanned_nmethod != NULL && cf != NULL) {
|
||||
// Safepoints can occur when the sweeper is scanning an nmethod so
|
||||
// process it here to make sure it isn't unloaded in the middle of
|
||||
// a scan.
|
||||
cf->do_code_blob(_scanned_nmethod);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ======= Threads ========
|
||||
|
||||
|
|
@ -3416,7 +3424,7 @@ static void call_initPhase3(TRAPS) {
|
|||
}
|
||||
|
||||
void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) {
|
||||
TraceStartupTime timer("Initialize java.lang classes");
|
||||
TraceTime timer("Initialize java.lang classes", TRACETIME_LOG(Info, startuptime));
|
||||
|
||||
if (EagerXrunInit && Arguments::init_libraries_at_startup()) {
|
||||
create_vm_init_libraries();
|
||||
|
|
@ -3468,7 +3476,7 @@ void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) {
|
|||
}
|
||||
|
||||
void Threads::initialize_jsr292_core_classes(TRAPS) {
|
||||
TraceStartupTime timer("Initialize java.lang.invoke classes");
|
||||
TraceTime timer("Initialize java.lang.invoke classes", TRACETIME_LOG(Info, startuptime));
|
||||
|
||||
initialize_class(vmSymbols::java_lang_invoke_MethodHandle(), CHECK);
|
||||
initialize_class(vmSymbols::java_lang_invoke_MemberName(), CHECK);
|
||||
|
|
@ -3539,7 +3547,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
|
|||
HOTSPOT_VM_INIT_BEGIN();
|
||||
|
||||
// Timing (must come after argument parsing)
|
||||
TraceStartupTime timer("Create VM");
|
||||
TraceTime timer("Create VM", TRACETIME_LOG(Info, startuptime));
|
||||
|
||||
// Initialize the os module after parsing the args
|
||||
jint os_init_2_result = os::init_2();
|
||||
|
|
@ -3628,7 +3636,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
|
|||
JvmtiExport::transition_pending_onload_raw_monitors();
|
||||
|
||||
// Create the VMThread
|
||||
{ TraceStartupTime timer("Start VMThread");
|
||||
{ TraceTime timer("Start VMThread", TRACETIME_LOG(Info, startuptime));
|
||||
|
||||
VMThread::create();
|
||||
Thread* vmthread = VMThread::vm_thread();
|
||||
|
|
@ -3703,18 +3711,9 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
|
|||
// set_init_completed has just been called, causing exceptions not to be shortcut
|
||||
// anymore. We call vm_exit_during_initialization directly instead.
|
||||
|
||||
#if INCLUDE_ALL_GCS
|
||||
// Support for ConcurrentMarkSweep. This should be cleaned up
|
||||
// and better encapsulated. The ugly nested if test would go away
|
||||
// once things are properly refactored. XXX YSR
|
||||
if (UseConcMarkSweepGC || UseG1GC) {
|
||||
if (UseConcMarkSweepGC) {
|
||||
ConcurrentMarkSweepThread::makeSurrogateLockerThread(CHECK_JNI_ERR);
|
||||
} else {
|
||||
ConcurrentMarkThread::makeSurrogateLockerThread(CHECK_JNI_ERR);
|
||||
}
|
||||
}
|
||||
#endif // INCLUDE_ALL_GCS
|
||||
// Initialize reference pending list locker
|
||||
bool needs_locker_thread = Universe::heap()->needs_reference_pending_list_locker_thread();
|
||||
ReferencePendingListLocker::initialize(needs_locker_thread, CHECK_JNI_ERR);
|
||||
|
||||
// Signal Dispatcher needs to be started before VMInit event is posted
|
||||
os::signal_init();
|
||||
|
|
@ -4348,9 +4347,13 @@ void Threads::create_thread_roots_marking_tasks(GCTaskQueue* q) {
|
|||
|
||||
void Threads::nmethods_do(CodeBlobClosure* cf) {
|
||||
ALL_JAVA_THREADS(p) {
|
||||
p->nmethods_do(cf);
|
||||
// This is used by the code cache sweeper to mark nmethods that are active
|
||||
// on the stack of a Java thread. Ignore the sweeper thread itself to avoid
|
||||
// marking CodeCacheSweeperThread::_scanned_nmethod as active.
|
||||
if(!p->is_Code_cache_sweeper_thread()) {
|
||||
p->nmethods_do(cf);
|
||||
}
|
||||
}
|
||||
VMThread::vm_thread()->nmethods_do(cf);
|
||||
}
|
||||
|
||||
void Threads::metadata_do(void f(Metadata*)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue