Skip to content
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

Add a stub for JVM_IsContainerized #19803

Merged
merged 1 commit into from
Jul 3, 2024
Merged

Add a stub for JVM_IsContainerized #19803

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
6 changes: 6 additions & 0 deletions runtime/j9vm/exports.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,12 @@ if(NOT JAVA_SPEC_VERSION LESS 23)
)
endif()

if(NOT JAVA_SPEC_VERSION LESS 24)
jvm_add_exports(jvm
JVM_IsContainerized
)
endif()

if(J9VM_OPT_JITSERVER)
jvm_add_exports(jvm
JITServer_CreateServer
Expand Down
5 changes: 5 additions & 0 deletions runtime/j9vm/j9vmnatives.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,4 +472,9 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
<!-- Additions for Java 23 (General) -->
<export name="JVM_GetCDSConfigStatus"/>
</exports>

<exports group="jdk24">
<!-- Additions for Java 24 (General) -->
<export name="JVM_IsContainerized"/>
</exports>
</exportlists>
8 changes: 8 additions & 0 deletions runtime/j9vm/javanextvmi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,4 +792,12 @@ JVM_GetCDSConfigStatus()
}
#endif /* JAVA_SPEC_VERSION >= 23 */

#if JAVA_SPEC_VERSION >= 24
JNIEXPORT jboolean JNICALL
JVM_IsContainerized(void)
{
return JNI_FALSE;
}
#endif /* JAVA_SPEC_VERSION >= 24 */

} /* extern "C" */
2 changes: 2 additions & 0 deletions runtime/redirector/forwarders.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,3 +442,5 @@ _IF([JAVA_SPEC_VERSION >= 23],
[_X(JVM_VirtualThreadDisableSuspend, JNICALL, false, void, JNIEnv *env, jclass clz, jboolean enter)])
_IF([JAVA_SPEC_VERSION >= 23],
[_X(JVM_GetCDSConfigStatus, JNICALL, false, jint, void)])
_IF([JAVA_SPEC_VERSION >= 24],
[_X(JVM_IsContainerized, JNICALL, false, jboolean, void)])