mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
8315369: [JVMCI] failure to attach to a libgraal isolate during shutdown should not be fatal
Reviewed-by: never
This commit is contained in:
parent
d1cabe4f22
commit
d7e4087faf
7 changed files with 132 additions and 111 deletions
|
@ -115,7 +115,7 @@ bool JVMCICompileState::jvmti_state_changed() const {
|
|||
return false;
|
||||
}
|
||||
|
||||
void JVMCIEnv::init_env_mode_runtime(JavaThread* thread, JNIEnv* parent_env, bool jni_enomem_is_fatal) {
|
||||
void JVMCIEnv::init_env_mode_runtime(JavaThread* thread, JNIEnv* parent_env) {
|
||||
assert(thread != nullptr, "npe");
|
||||
_env = nullptr;
|
||||
_pop_frame_on_close = false;
|
||||
|
@ -147,18 +147,14 @@ void JVMCIEnv::init_env_mode_runtime(JavaThread* thread, JNIEnv* parent_env, boo
|
|||
_is_hotspot = false;
|
||||
|
||||
_runtime = JVMCI::compiler_runtime(thread);
|
||||
int create_JavaVM_err = JNI_OK;
|
||||
_env = _runtime->init_shared_library_javavm(&create_JavaVM_err);
|
||||
_env = _runtime->init_shared_library_javavm(&_init_error);
|
||||
if (_env != nullptr) {
|
||||
// Creating the JVMCI shared library VM also attaches the current thread
|
||||
_detach_on_close = true;
|
||||
} else if (create_JavaVM_err != JNI_OK) {
|
||||
if (!jni_enomem_is_fatal && create_JavaVM_err == JNI_ENOMEM) {
|
||||
_jni_enomem = true;
|
||||
return;
|
||||
} else {
|
||||
fatal("JNI_CreateJavaVM failed with return value %d", create_JavaVM_err);
|
||||
}
|
||||
} else if (_init_error != JNI_OK) {
|
||||
// Caller creating this JVMCIEnv must handle the error.
|
||||
JVMCI_event_1("[%s:%d] Error creating libjvmci (err: %d)", _file, _line, _init_error);
|
||||
return;
|
||||
} else {
|
||||
_runtime->GetEnv(thread, (void**)&parent_env, JNI_VERSION_1_2);
|
||||
if (parent_env != nullptr) {
|
||||
|
@ -174,15 +170,14 @@ void JVMCIEnv::init_env_mode_runtime(JavaThread* thread, JNIEnv* parent_env, boo
|
|||
attach_args.version = JNI_VERSION_1_2;
|
||||
attach_args.name = const_cast<char*>(thread->name());
|
||||
attach_args.group = nullptr;
|
||||
jint attach_result = _runtime->AttachCurrentThread(thread, (void**) &_env, &attach_args);
|
||||
if (attach_result == JNI_OK) {
|
||||
_init_error = _runtime->AttachCurrentThread(thread, (void**) &_env, &attach_args);
|
||||
if (_init_error == JNI_OK) {
|
||||
_detach_on_close = true;
|
||||
} else if (!jni_enomem_is_fatal && attach_result == JNI_ENOMEM) {
|
||||
_env = nullptr;
|
||||
_jni_enomem = true;
|
||||
return;
|
||||
} else {
|
||||
fatal("Error attaching current thread (%s) to JVMCI shared library JNI interface", attach_args.name);
|
||||
// Caller creating this JVMCIEnv must handle the error.
|
||||
_env = nullptr;
|
||||
JVMCI_event_1("[%s:%d] Error attaching to libjvmci (err: %d)", _file, _line, _init_error);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -193,41 +188,36 @@ void JVMCIEnv::init_env_mode_runtime(JavaThread* thread, JNIEnv* parent_env, boo
|
|||
JNIAccessMark jni(this, thread);
|
||||
jint result = _env->PushLocalFrame(32);
|
||||
if (result != JNI_OK) {
|
||||
char message[256];
|
||||
jio_snprintf(message, 256, "Uncaught exception pushing local frame for JVMCIEnv scope entered at %s:%d", _file, _line);
|
||||
JVMCIRuntime::fatal_exception(this, message);
|
||||
JVMCI_event_1("[%s:%d] Error pushing local JNI frame (err: %d)", _file, _line, _init_error);
|
||||
return;
|
||||
}
|
||||
_pop_frame_on_close = true;
|
||||
}
|
||||
|
||||
JVMCIEnv::JVMCIEnv(JavaThread* thread, JVMCICompileState* compile_state, const char* file, int line):
|
||||
_throw_to_caller(false), _file(file), _line(line), _jni_enomem(false), _compile_state(compile_state) {
|
||||
// In case of JNI_ENOMEM, there's a good chance a subsequent attempt to create libjvmci or attach to it
|
||||
// might succeed. Other errors most likely indicate a non-recoverable error in the JVMCI runtime.
|
||||
bool jni_enomem_is_fatal = false;
|
||||
init_env_mode_runtime(thread, nullptr, jni_enomem_is_fatal);
|
||||
if (_jni_enomem) {
|
||||
compile_state->set_failure(true, "Out of memory while attaching JVMCI compiler to current thread");
|
||||
}
|
||||
_throw_to_caller(false), _file(file), _line(line), _init_error(JNI_OK), _compile_state(compile_state) {
|
||||
init_env_mode_runtime(thread, nullptr);
|
||||
}
|
||||
|
||||
JVMCIEnv::JVMCIEnv(JavaThread* thread, const char* file, int line):
|
||||
_throw_to_caller(false), _file(file), _line(line), _jni_enomem(false), _compile_state(nullptr) {
|
||||
_throw_to_caller(false), _file(file), _line(line), _init_error(JNI_OK), _compile_state(nullptr) {
|
||||
init_env_mode_runtime(thread, nullptr);
|
||||
}
|
||||
|
||||
JVMCIEnv::JVMCIEnv(JavaThread* thread, JNIEnv* parent_env, const char* file, int line):
|
||||
_throw_to_caller(true), _file(file), _line(line), _jni_enomem(false), _compile_state(nullptr) {
|
||||
_throw_to_caller(true), _file(file), _line(line), _init_error(JNI_OK), _compile_state(nullptr) {
|
||||
assert(parent_env != nullptr, "npe");
|
||||
init_env_mode_runtime(thread, parent_env);
|
||||
assert(_env == nullptr || parent_env == _env, "mismatched JNIEnvironment");
|
||||
assert(_init_error == JNI_OK, "err: %d", _init_error);
|
||||
}
|
||||
|
||||
void JVMCIEnv::init(JavaThread* thread, bool is_hotspot, bool jni_enomem_is_fatal, const char* file, int line) {
|
||||
void JVMCIEnv::init(JavaThread* thread, bool is_hotspot, const char* file, int line) {
|
||||
_compile_state = nullptr;
|
||||
_throw_to_caller = false;
|
||||
_file = file;
|
||||
_line = line;
|
||||
_jni_enomem = false;
|
||||
_init_error = JNI_OK;
|
||||
if (is_hotspot) {
|
||||
_env = nullptr;
|
||||
_pop_frame_on_close = false;
|
||||
|
@ -235,10 +225,31 @@ void JVMCIEnv::init(JavaThread* thread, bool is_hotspot, bool jni_enomem_is_fata
|
|||
_is_hotspot = true;
|
||||
_runtime = JVMCI::java_runtime();
|
||||
} else {
|
||||
init_env_mode_runtime(thread, nullptr, jni_enomem_is_fatal);
|
||||
init_env_mode_runtime(thread, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void JVMCIEnv::check_init(JVMCI_TRAPS) {
|
||||
guarantee(JVMCIENV != this, "must be");
|
||||
if (_init_error == JNI_OK) {
|
||||
return;
|
||||
}
|
||||
if (_init_error == JNI_ENOMEM) {
|
||||
JVMCI_THROW_MSG(OutOfMemoryError, "JNI_ENOMEM creating or attaching to libjvmci");
|
||||
}
|
||||
JVMCI_THROW_MSG(InternalError, err_msg("Error creating or attaching to libjvmci (err: %d)", _init_error));
|
||||
}
|
||||
|
||||
void JVMCIEnv::check_init(TRAPS) {
|
||||
if (_init_error == JNI_OK) {
|
||||
return;
|
||||
}
|
||||
if (_init_error == JNI_ENOMEM) {
|
||||
THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), "JNI_ENOMEM creating or attaching to libjvmci");
|
||||
}
|
||||
THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(), err_msg("Error creating or attaching to libjvmci (err: %d)", _init_error));
|
||||
}
|
||||
|
||||
// Prints a pending exception (if any) and its stack trace to st.
|
||||
// Also partially logs the stack trace to the JVMCI event log.
|
||||
void JVMCIEnv::describe_pending_exception(outputStream* st) {
|
||||
|
@ -561,7 +572,7 @@ jboolean JVMCIEnv::transfer_pending_exception(JavaThread* THREAD, JVMCIEnv* peer
|
|||
}
|
||||
|
||||
JVMCIEnv::~JVMCIEnv() {
|
||||
if (_jni_enomem) {
|
||||
if (_init_error != JNI_OK) {
|
||||
return;
|
||||
}
|
||||
if (_throw_to_caller) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue