Skip to content

8349977: JVMCIRuntime::_shared_library_javavm_id should be jlong #23610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8349977: JVMCIRuntime::_shared_library_javavm_id should be jlong #23610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2724,7 +2724,7 @@ C2V_VMENTRY_PREFIX(jboolean, attachCurrentThread, (JNIEnv* env, jobject c2vm, jb
if (res == JNI_OK) {
guarantee(peerJNIEnv != nullptr, "must be");
runtime->init_JavaVM_info(javaVM_info, JVMCI_CHECK_0);
JVMCI_event_1("attached to JavaVM[%d] for JVMCI runtime %d", runtime->get_shared_library_javavm_id(), runtime->id());
JVMCI_event_1("attached to JavaVM[" JLONG_FORMAT "] for JVMCI runtime %d", runtime->get_shared_library_javavm_id(), runtime->id());
return true;
}
JVMCI_THROW_MSG_0(InternalError, err_msg("Error %d while attaching %s", res, attach_args.name));
Expand Down Expand Up @@ -2757,7 +2757,7 @@ C2V_VMENTRY_PREFIX(jboolean, detachCurrentThread, (JNIEnv* env, jobject c2vm, jb
if (res != JNI_OK) {
JVMCI_THROW_MSG_0(InternalError, err_msg("Error %d while attaching %s", res, thread->name()));
}
JVMCI_event_1("detached from JavaVM[%d] for JVMCI runtime %d",
JVMCI_event_1("detached from JavaVM[" JLONG_FORMAT "] for JVMCI runtime %d",
runtime->get_shared_library_javavm_id(), runtime->id());
if (release) {
return runtime->detach_thread(thread, "user thread detach");
Expand Down
6 changes: 3 additions & 3 deletions src/hotspot/share/jvmci/jvmciRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ bool JVMCIRuntime::destroy_shared_library_javavm() {
guarantee(_num_attached_threads == cannot_be_attached,
"cannot destroy JavaVM for JVMCI runtime %d with %d attached threads", _id, _num_attached_threads);
JavaVM* javaVM;
int javaVM_id = _shared_library_javavm_id;
jlong javaVM_id = _shared_library_javavm_id;
{
// Exactly one thread can destroy the JavaVM
// and release the handle to it.
Expand All @@ -1588,9 +1588,9 @@ bool JVMCIRuntime::destroy_shared_library_javavm() {
result = javaVM->DestroyJavaVM();
}
if (result == JNI_OK) {
JVMCI_event_1("destroyed JavaVM[%d]@" PTR_FORMAT " for JVMCI runtime %d", javaVM_id, p2i(javaVM), _id);
JVMCI_event_1("destroyed JavaVM[" JLONG_FORMAT "]@" PTR_FORMAT " for JVMCI runtime %d", javaVM_id, p2i(javaVM), _id);
} else {
warning("Non-zero result (%d) when calling JNI_DestroyJavaVM on JavaVM[%d]@" PTR_FORMAT, result, javaVM_id, p2i(javaVM));
warning("Non-zero result (%d) when calling JNI_DestroyJavaVM on JavaVM[" JLONG_FORMAT "]@" PTR_FORMAT, result, javaVM_id, p2i(javaVM));
}
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/jvmci/jvmciRuntime.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
JavaVM* _shared_library_javavm;

// Id for _shared_library_javavm.
int _shared_library_javavm_id;
jlong _shared_library_javavm_id;

// Position and link in global list of JVMCI shared library runtimes.
// The HotSpot heap based runtime will have an id of -1 and the
Expand Down Expand Up @@ -280,7 +280,7 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
bool has_shared_library_javavm() { return _shared_library_javavm != nullptr; }

// Gets an ID for the JVMCI shared library JavaVM associated with this runtime.
int get_shared_library_javavm_id() { return _shared_library_javavm_id; }
jlong get_shared_library_javavm_id() { return _shared_library_javavm_id; }

// Copies info about the JVMCI shared library JavaVM associated with this
// runtime into `info` as follows:
Expand Down