Implement JVM_IsContainerized and fix JVM_IsUseContainerSupport

An implementation of JVM_IsContainerized has been added.

The signature of JVM_IsUseContainerSupport has been corrected.

Closes: #19801

Signed-off-by: Babneet Singh <[email protected]>

Author: babsingh

runtime/j9vm/java11vmi.c

@@ -89,6 +89,7 @@ static UDATA allowReadAccessToModule(J9VMThread * currentThread, J9Module * from
 static void trcModulesAddReadsModule(J9VMThread *currentThread, jobject toModule, J9Module *j9FromMod, J9Module *j9ToMod);
 
 /* These come from jvm.c */
+extern J9JavaVM *BFUjavaVM;
 extern IDATA (*f_monitorEnter)(omrthread_monitor_t monitor);
 extern IDATA (*f_monitorExit)(omrthread_monitor_t monitor);
 
@@ -1730,13 +1731,19 @@ JVM_IsSharingEnabled(JNIEnv *env)
 #endif /* JAVA_SPEC_VERSION < 23 */
 #endif /* JAVA_SPEC_VERSION >= 16 */
 
+/**
+ * @brief Determine if -XX:+UseContainerSupport is specified.
+ *
+ * @return JNI_TRUE if -XX:+UseContainerSupport is specified; otherwise, JNI_FALSE
+ */
 JNIEXPORT jboolean JNICALL
-JVM_IsUseContainerSupport(JNIEnv *env)
+JVM_IsUseContainerSupport(void)
 {
-	J9VMThread *const currentThread = (J9VMThread *)env;
-	J9JavaVM *vm = currentThread->javaVM;
+	J9JavaVM *vm = BFUjavaVM;
 	jboolean result = JNI_FALSE;
 
+	Assert_SC_true(NULL != vm);
+
 	if (J9_ARE_ALL_BITS_SET(vm->extendedRuntimeFlags2, J9_EXTENDED_RUNTIME2_USE_CONTAINER_SUPPORT)) {
 		/* Return true if -XX:+UseContainerSupport is specified. This option is enabled by default. */
 		result = JNI_TRUE;

runtime/j9vm/javanextvmi.cpp

@@ -793,10 +793,25 @@ JVM_GetCDSConfigStatus()
 #endif /* JAVA_SPEC_VERSION >= 23 */
 
 #if JAVA_SPEC_VERSION >= 24
+/**
+ * @brief Determine if the JVM is running inside a container.
+ *
+ * @return JNI_TRUE if running inside a container; otherwise, JNI_FALSE
+ */
 JNIEXPORT jboolean JNICALL
 JVM_IsContainerized(void)
 {
-	return JNI_FALSE;
+	J9JavaVM *vm = BFUjavaVM;
+	jboolean isContainerized = JNI_FALSE;
+
+	Assert_SC_true(NULL != vm);
+
+	OMRPORT_ACCESS_FROM_J9PORT(vm->portLibrary);
+	if (omrsysinfo_is_running_in_container()) {
+		isContainerized = JNI_TRUE;
+	}
+
+	return isContainerized;
 }
 #endif /* JAVA_SPEC_VERSION >= 24 */
 

runtime/redirector/forwarders.m4

@@ -382,7 +382,7 @@ _IF([JAVA_SPEC_VERSION >= 16],
 	[_X(JVM_DefineArchivedModules, JNICALL, false, void, JNIEnv *env, jobject obj1, jobject obj2)])
 _IF([JAVA_SPEC_VERSION >= 16],
 	[_X(JVM_LogLambdaFormInvoker, JNICALL, false, void, JNIEnv *env, jstring str)])
-_X(JVM_IsUseContainerSupport, JNICALL, false, jboolean, JNIEnv *env)
+_X(JVM_IsUseContainerSupport, JNICALL, false, jboolean, void)
 _X(AsyncGetCallTrace, JNICALL, false, void, void *trace, jint depth, void *ucontext)
 _IF([JAVA_SPEC_VERSION >= 17],
 	[_X(JVM_DumpClassListToFile, JNICALL, false, void, JNIEnv *env, jstring str)])