Implementation of Isolate::RequestInterrupt().

Author: iamstolis

graal-nodejs/deps/v8/src/graal/callbacks.cc

@@ -120,7 +120,8 @@ static const JNINativeMethod callbacks[] = {
     CALLBACK("throwDataCloneError", "(JLjava/lang/Object;)V", &GraalThrowDataCloneError),
     CALLBACK("getSharedArrayBufferId", "(JLjava/lang/Object;)I", &GraalGetSharedArrayBufferId),
     CALLBACK("getSharedArrayBufferFromId", "(JI)Ljava/lang/Object;", &GraalGetSharedArrayBufferFromId),
-    CALLBACK("syntheticModuleEvaluationSteps", "(JLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", &GraalSyntheticModuleEvaluationSteps)
+    CALLBACK("syntheticModuleEvaluationSteps", "(JLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", &GraalSyntheticModuleEvaluationSteps),
+    CALLBACK("executeInterruptCallback", "(JJ)V", &GraalExecuteInterruptCallback),
  };
 
 static const int CALLBACK_COUNT = sizeof(callbacks) / sizeof(*callbacks);
@@ -853,3 +854,9 @@ jobject GraalSyntheticModuleEvaluationSteps(JNIEnv* env, jclass nativeAccess, jl
         return env->NewLocalRef(graal_value->GetJavaObject());
     }
 }
+
+void GraalExecuteInterruptCallback(JNIEnv* env, jclass nativeAccess, jlong callback, jlong data) {
+    GraalIsolate* graal_isolate = CurrentIsolateChecked();
+    v8::Isolate* isolate = reinterpret_cast<v8::Isolate*> (graal_isolate);
+    ((v8::InterruptCallback) callback)(isolate, (void*) data);
+}

graal-nodejs/deps/v8/src/graal/callbacks.h

@@ -156,4 +156,6 @@ jobject GraalExecutePrepareStackTraceCallback(JNIEnv* env, jclass nativeAccess,
 
 jobject GraalSyntheticModuleEvaluationSteps(JNIEnv* env, jclass nativeAccess, jlong callback, jobject java_context, jobject java_module);
 
+void GraalExecuteInterruptCallback(JNIEnv* env, jclass nativeAccess, jlong callback, jlong data);
+
 #endif /* CALLBACKS_H_ */

graal-nodejs/deps/v8/src/graal/graal_isolate.cc

@@ -724,6 +724,7 @@ GraalIsolate::GraalIsolate(JavaVM* jvm, JNIEnv* env, v8::Isolate::CreateParams c
     ACCESS_METHOD(GraalAccessMethod::isolate_terminate_execution, "isolateTerminateExecution", "()V")
     ACCESS_METHOD(GraalAccessMethod::isolate_cancel_terminate_execution, "isolateCancelTerminateExecution", "()V")
     ACCESS_METHOD(GraalAccessMethod::isolate_is_execution_terminating, "isolateIsExecutionTerminating", "()Z")
+    ACCESS_METHOD(GraalAccessMethod::isolate_request_interrupt, "isolateRequestInterrupt", "(JJ)V")
     ACCESS_METHOD(GraalAccessMethod::isolate_get_int_placeholder, "isolateGetIntPlaceholder", "()Ljava/lang/Object;")
     ACCESS_METHOD(GraalAccessMethod::isolate_get_safe_int_placeholder, "isolateGetSafeIntPlaceholder", "()Ljava/lang/Object;")
     ACCESS_METHOD(GraalAccessMethod::isolate_get_double_placeholder, "isolateGetDoublePlaceholder", "()Ljava/lang/Object;")
@@ -1499,3 +1500,21 @@ v8::ArrayBuffer::Allocator* GraalIsolate::GetArrayBufferAllocator() {
 void GraalIsolate::SchedulePauseOnNextStatement() {
     JNI_CALL_VOID(this, GraalAccessMethod::isolate_schedule_pause_on_next_statement);
 }
+
+void GraalIsolate::RequestInterrupt(v8::InterruptCallback callback, void* data) {
+    // We cannot use GetJNIEnv()/JNI_CALL_VOID because RequestInterrupt()
+    // can be called from a thread that does not correspond to this isolate
+    GraalIsolate* current_isolate = CurrentIsolate();
+    JNIEnv* env;
+    if (current_isolate == nullptr) {
+        // the thread does not belong to any isolate (i.e. is not attached to JVM)
+        jvm_->AttachCurrentThread((void**) &env, nullptr);
+    } else {
+        env = current_isolate->GetJNIEnv();
+    }
+    jmethodID method_id = GetJNIMethod(GraalAccessMethod::isolate_request_interrupt);
+    env->functions->CallVoidMethod(env, access_, method_id, (jlong) callback, (jlong) data);
+    if (current_isolate == nullptr) {
+        jvm_->DetachCurrentThread();
+    }
+}

graal-nodejs/deps/v8/src/graal/graal_isolate.h

@@ -206,6 +206,7 @@ enum GraalAccessMethod {
     isolate_terminate_execution,
     isolate_cancel_terminate_execution,
     isolate_is_execution_terminating,
+    isolate_request_interrupt,
     isolate_get_int_placeholder,
     isolate_get_safe_int_placeholder,
     isolate_get_double_placeholder,
@@ -475,6 +476,7 @@ class GraalIsolate {
     void TerminateExecution();
     void CancelTerminateExecution();
     bool IsExecutionTerminating();
+    void RequestInterrupt(v8::InterruptCallback callback, void* data);
 
     inline JNIEnv* GetJNIEnv() {
         return jni_env_;

graal-nodejs/deps/v8/src/graal/v8.cc

@@ -3523,7 +3523,7 @@ namespace v8 {
     }
 
     void Isolate::RequestInterrupt(InterruptCallback callback, void* data) {
-        TRACE
+        reinterpret_cast<GraalIsolate*> (this)->RequestInterrupt(callback, data);
     }
 
     void Isolate::ClearKeptObjects() {

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java

@@ -3215,6 +3215,14 @@ public synchronized void isolateTerminateExecution() {
         }
     }
 
+    public void isolateRequestInterrupt(long callback, long data) {
+        Debugger debugger = lookupInstrument("debugger", Debugger.class);
+        debugger.startSession(se -> {
+            se.getSession().close();
+            NativeAccess.executeInterruptCallback(callback, data);
+        }).suspendNextExecution();
+    }
+
     static final class GraalJSKillException extends ThreadDeath {
         private static final long serialVersionUID = 3930431622452607906L;
     }

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/NativeAccess.java

@@ -164,4 +164,6 @@ public static native Object executePropertyHandlerDefiner(long functionPointer,
 
     public static native Object syntheticModuleEvaluationSteps(long callback, Object context, Object module);
 
+    public static native void executeInterruptCallback(long callback, long data);
+
 }

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/svmnodejs.jniconfig

@@ -108,6 +108,7 @@
       { "name": "isolateIsExecutionTerminating" },
       { "name": "isolateMeasureMemory" },
       { "name": "isolatePerformGC" },
+      { "name": "isolateRequestInterrupt" },
       { "name": "isolateRunMicrotasks" },
       { "name": "isolateSchedulePauseOnNextStatement" },
       { "name": "isolateTerminateExecution" },
@@ -326,6 +327,7 @@
       { "name": "executeFunction4" },
       { "name": "executeFunction5" },
       { "name": "executeFunction6" },
+      { "name": "executeInterruptCallback" },
       { "name": "executePrepareStackTraceCallback" },
       { "name": "executePropertyHandlerDefiner" },
       { "name": "executePropertyHandlerDeleter" },