Merge pull request #15876 from fengxue-IS/cont_clean

Add Continuation cleanup API
eclipse-openj9 · Sep 15, 2022 · e3cd092 · e3cd092
2 parents 9e34d07 + 2d68355
commit e3cd092
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 24 deletions.
diff --git a/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java
@@ -157,7 +157,7 @@ private static void execute(Continuation cont) {
 			cont.runnable.run();
 		} finally {
 			cont.finished = true;
-			yieldImpl(true);
+			yieldImpl();
 		}
 	}
 
@@ -211,7 +211,7 @@ public static boolean yield(ContinuationScope scope) {
 			}
 			throw new IllegalStateException("Continuation is pinned: " + reason);
 		}
-		return yieldImpl(false);
+		return yieldImpl();
 	}
 
 	protected void onPinned(Pinned reason) {
@@ -247,6 +247,6 @@ public PreemptStatus tryPreempt(Thread t) {
 	/* Continuation Native APIs */
 	private native boolean createContinuationImpl();
 	private native boolean enterImpl();
-	private static native boolean yieldImpl(boolean isFinished);
+	private static native boolean yieldImpl();
 
 }
diff --git a/runtime/j9vm/javanextvmi.cpp b/runtime/j9vm/javanextvmi.cpp
@@ -395,6 +395,9 @@ JVM_VirtualThreadUnmountEnd(JNIEnv *env, jobject thread, jboolean lastUnmount)
 
 	if (lastUnmount) {
 		vmFuncs->freeTLS(currentThread, threadObj);
+		/* CleanupContinuation */
+		j9object_t contObj = (j9object_t)J9VMJAVALANGVIRTUALTHREAD_CONT(currentThread, threadObj);
+		vmFuncs->freeContinuation(currentThread, contObj);
 	}
 
 	/* Allow thread to be inspected again. */

diff --git a/runtime/oti/VMHelpers.hpp b/runtime/oti/VMHelpers.hpp
@@ -2072,11 +2072,7 @@ class VM_VMHelpers
 	cleanupContinuationObject(J9VMThread *vmThread, J9Object *objectPtr)
 	{
 #if JAVA_SPEC_VERSION >= 19
-		J9VMContinuation *j9vmContinuation = J9VMJDKINTERNALVMCONTINUATION_VMREF(vmThread, objectPtr);
-		if (NULL != j9vmContinuation) {
-			/* clean up J9VMContinuation, set vmref = NULL */
-			J9VMJDKINTERNALVMCONTINUATION_SET_VMREF(vmThread, objectPtr, NULL);
-		}
+		vmThread->javaVM->internalVMFunctions->freeContinuation(vmThread, objectPtr);
 #endif /* JAVA_SPEC_VERSION >= 19 */
 	}
 };

diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h
@@ -4890,10 +4890,6 @@ typedef struct J9InternalVMFunctions {
 #endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 	j9object_t (*getClassNameString)(struct J9VMThread *currentThread, j9object_t classObject, jboolean internAndAssign);
 	j9object_t* (*getDefaultValueSlotAddress)(struct J9Class *clazz);
-#if JAVA_SPEC_VERSION >= 19
-	BOOLEAN (*createContinuation)(struct J9VMThread *currentThread, j9object_t continuationObject);
-	void (*freeTLS)(struct J9VMThread *currentThread, j9object_t threadObj);
-#endif /* JAVA_SPEC_VERSION >= 19 */
 #if JAVA_SPEC_VERSION >= 16
 	void * ( *createUpcallThunk)(struct J9UpcallMetaData *data);
 	void * ( *getArgPointer)(struct J9UpcallNativeSignature *nativeSig, void *argListPtr, int argIdx);
@@ -4907,6 +4903,9 @@ typedef struct J9InternalVMFunctions {
 	U_8 * (JNICALL *native2InterpJavaUpcallStruct)(struct J9UpcallMetaData *data, void *argsListPointer);
 #endif /* JAVA_SPEC_VERSION >= 16 */
 #if JAVA_SPEC_VERSION >= 19
+	BOOLEAN (*createContinuation)(struct J9VMThread *currentThread, j9object_t continuationObject);
+	void (*freeContinuation)(struct J9VMThread *currentThread, j9object_t continuationObject);
+	void (*freeTLS)(struct J9VMThread *currentThread, j9object_t threadObj);
 	UDATA (*walkContinuationStackFrames)(struct J9VMThread *currentThread, struct J9VMContinuation *continuation, J9StackWalkState *walkState);
 #endif /* JAVA_SPEC_VERSION >= 19 */
 } J9InternalVMFunctions;

diff --git a/runtime/oti/vm_api.h b/runtime/oti/vm_api.h
@@ -4335,6 +4335,15 @@ enterContinuation(struct J9VMThread *currentThread, j9object_t continuationObjec
 BOOLEAN
 yieldContinuation(struct J9VMThread *currentThread);
 
+/**
+ * @brief  Free the native memory allocated by Continuation
+ *
+ * @param currentThread the thread unmounting Continuation.
+ * @param continuationObject
+ */
+void
+freeContinuation(J9VMThread *currentThread, j9object_t continuationObject);
+
 /**
  * Determine if the current continuation is pinned.
  *

diff --git a/runtime/vm/BytecodeInterpreter.hpp b/runtime/vm/BytecodeInterpreter.hpp
@@ -5225,21 +5225,17 @@ class INTERPRETER_CLASS
 		return rc;
 	}
 
-	/* jdk.internal.vm.Continuation: private static native boolean yieldImpl(boolean isFinished); */
+	/* jdk.internal.vm.Continuation: private static native boolean yieldImpl(); */
 	VMINLINE VM_BytecodeAction
 	yieldContinuationImpl(REGISTER_ARGS_LIST)
 	{
 		VM_BytecodeAction rc = EXECUTE_BYTECODE;
-		UDATA isFinished = *(I_32*)_sp;
 
 		buildInternalNativeStackFrame(REGISTER_ARGS);
 		updateVMStruct(REGISTER_ARGS);
 
 		/* store the current Continuation state and swap to carrier thread stack */
 		yieldContinuation(_currentThread);
-		if (isFinished) {
-			/* CleanupContinuation */
-		}
 
 		VMStructHasBeenUpdated(REGISTER_ARGS);
 		restoreInternalNativeStackFrame(REGISTER_ARGS);

diff --git a/runtime/vm/ContinuationHelpers.cpp b/runtime/vm/ContinuationHelpers.cpp
@@ -105,9 +105,9 @@ enterContinuation(J9VMThread *currentThread, j9object_t continuationObject)
 	currentThread->callOutCount = 0;
 
 	if (started) {
-		/* resuming Continuation from yield */
+		/* resuming Continuation from yieldImpl */
 		VM_OutOfLineINL_Helpers::restoreInternalNativeStackFrame(currentThread);
-		VM_OutOfLineINL_Helpers::returnSingle(currentThread, JNI_TRUE, 1);
+		VM_OutOfLineINL_Helpers::returnSingle(currentThread, JNI_TRUE, 0);
 		result = FALSE;
 	} else {
 		/* start new Continuation execution */
@@ -147,6 +147,29 @@ yieldContinuation(J9VMThread *currentThread)
 	return result;
 }
 
+void
+freeContinuation(J9VMThread *currentThread, j9object_t continuationObject)
+{
+	J9VMContinuation *continuation = J9VMJDKINTERNALVMCONTINUATION_VMREF(currentThread, continuationObject);
+	if (NULL != continuation) {
+		PORT_ACCESS_FROM_VMC(currentThread);
+		/* Free all stack used by continuation */
+		J9JavaStack *currentStack = continuation->stackObject;
+		do {
+			J9JavaStack *previous = currentStack->previous;
+
+			freeJavaStack(currentThread->javaVM, currentStack);
+			currentStack = previous;
+		} while (NULL != currentStack);
+
+		/* Free the J9VMContinuation struct */
+		j9mem_free_memory(continuation);
+
+		/* Update Continuation object's vmRef field */
+		J9VMJDKINTERNALVMCONTINUATION_SET_VMREF(currentThread, continuationObject, NULL);
+	}
+}
+
 jint
 isPinnedContinuation(J9VMThread *currentThread)
 {

diff --git a/runtime/vm/bindnatv.cpp b/runtime/vm/bindnatv.cpp
@@ -296,7 +296,7 @@ static inlMapping mappings[] = {
 #endif /* JAVA_SPEC_VERSION >= 16 */
 #if JAVA_SPEC_VERSION >= 19
 	{ "Java_jdk_internal_vm_Continuation_enterImpl__", J9_BCLOOP_SEND_TARGET_ENTER_CONTINUATION },
-	{ "Java_jdk_internal_vm_Continuation_yieldImpl__Z", J9_BCLOOP_SEND_TARGET_YIELD_CONTINUATION },
+	{ "Java_jdk_internal_vm_Continuation_yieldImpl__", J9_BCLOOP_SEND_TARGET_YIELD_CONTINUATION },
 	{ "Java_jdk_internal_vm_Continuation_isPinnedImpl__", J9_BCLOOP_SEND_TARGET_ISPINNED_CONTINUATION },
 #endif /* JAVA_SPEC_VERSION >= 19 */
 };

diff --git a/runtime/vm/intfunc.c b/runtime/vm/intfunc.c
@@ -415,10 +415,6 @@ J9InternalVMFunctions J9InternalFunctions = {
 #endif /* defined(J9VM_OPT_CRIU_SUPPORT) */
 	getClassNameString,
 	getDefaultValueSlotAddress,
-#if JAVA_SPEC_VERSION >= 19
-	createContinuation,
-	freeTLS,
-#endif /* JAVA_SPEC_VERSION >= 19 */
 #if JAVA_SPEC_VERSION >= 16
 	createUpcallThunk,
 	getArgPointer,
@@ -432,6 +428,9 @@ J9InternalVMFunctions J9InternalFunctions = {
 	native2InterpJavaUpcallStruct,
 #endif /* JAVA_SPEC_VERSION >= 16 */
 #if JAVA_SPEC_VERSION >= 19
+	createContinuation,
+	freeContinuation,
+	freeTLS,
 	walkContinuationStackFrames,
 #endif /* JAVA_SPEC_VERSION >= 19 */
 };