Merge pull request #17439 from eclipse-openj9/revert-17417-jvm_init_s…

…hutdown_sync_039 Revert "(0.39) Sync JVM init and exit paths"
eclipse-openj9 · May 19, 2023 · a10e6b9 · a10e6b9
2 parents 8b5fd99 + 9336240
commit a10e6b9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 19 deletions.
diff --git a/runtime/vm/jniinv.c b/runtime/vm/jniinv.c
@@ -160,10 +160,7 @@ jint JNICALL J9_CreateJavaVM(JavaVM ** p_vm, void ** p_env, J9CreateJavaVMParams
 	env = vm->mainThread;
 
 	/* Success */
-	omrthread_monitor_enter(vm->runtimeFlagsMutex);
 	vm->runtimeFlags |= J9_RUNTIME_INITIALIZED;
-	omrthread_monitor_notify_all(vm->runtimeFlagsMutex);
-	omrthread_monitor_exit(vm->runtimeFlagsMutex);
 	*p_env = (void*) env;
 
 	/* Link the VM into the list */
@@ -349,14 +346,6 @@ protectedDestroyJavaVM(J9PortLibrary* portLibrary, void * userData)
 		 */
 		return JNI_ERR;
 	}
-	/* Wait until the JVM has initialized before exiting the JVM. */
-	while (OMR_ARE_NO_BITS_SET(vm->runtimeFlags, J9_RUNTIME_INITIALIZED)) {
-		if (vm->runtimeFlagsMutex != NULL) {
-			omrthread_monitor_wait(vm->runtimeFlagsMutex);
-		} else {
-			omrthread_yield();
-		}
-	}
 	if (vm->runtimeFlagsMutex != NULL) {
 		omrthread_monitor_exit(vm->runtimeFlagsMutex);
 	}

diff --git a/runtime/vm/jvminit.c b/runtime/vm/jvminit.c
@@ -536,14 +536,6 @@ exitJavaVM(J9VMThread * vmThread, IDATA rc)
 		}
 
 		vm->runtimeFlags |= J9_RUNTIME_EXIT_STARTED;
-		/* Wait until the JVM has initialized before exiting the JVM. */
-		while (OMR_ARE_NO_BITS_SET(vm->runtimeFlags, J9_RUNTIME_INITIALIZED)) {
-			if (vm->runtimeFlagsMutex != NULL) {
-				omrthread_monitor_wait(vm->runtimeFlagsMutex);
-			} else {
-				omrthread_yield();
-			}
-		}
 		if(vm->runtimeFlagsMutex != NULL) {
 			omrthread_monitor_exit(vm->runtimeFlagsMutex);
 		}