chore: main merge

Author: NathanWalker

test-app/runtime/src/main/cpp/com_tns_Runtime.cpp

@@ -2,6 +2,7 @@
 #include "Runtime.h"
 #include "NativeScriptException.h"
 #include "CallbackHandlers.h"
+#include "WorkerWrapper.h"
 #include <sstream>
 #include <android/log.h>
 
@@ -352,69 +353,6 @@ extern "C" JNIEXPORT jint Java_com_tns_Runtime_getCurrentRuntimeIdLegacy(JNIEnv*
     return getCurrentRuntimeIdCritical_impl();
 }
 
-extern "C" JNIEXPORT void Java_com_tns_Runtime_WorkerGlobalOnMessageCallback(JNIEnv* env, jobject obj, jint runtimeId, jstring msg) {
-    // Worker Thread runtime
-    auto runtime = TryGetRuntime(runtimeId);
-    if (runtime == nullptr) {
-        // TODO: Pete: Log message informing the developer of the failure
-        return;
-    }
-
-    auto isolate = runtime->GetIsolate();
-
-    v8::Locker locker(isolate);
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handleScope(isolate);
-    auto context = runtime->GetContext();
-    v8::Context::Scope context_scope(context);
-
-    CallbackHandlers::WorkerGlobalOnMessageCallback(isolate, msg);
-}
-
-extern "C" JNIEXPORT void Java_com_tns_Runtime_WorkerObjectOnMessageCallback(JNIEnv* env, jobject obj, jint runtimeId, jint workerId, jstring msg) {
-    // Main Thread runtime
-    auto runtime = TryGetRuntime(runtimeId);
-    if (runtime == nullptr) {
-        // TODO: Pete: Log message informing the developer of the failure
-        return;
-    }
-
-    auto isolate = runtime->GetIsolate();
-
-    v8::Locker locker(isolate);
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handleScope(isolate);
-    auto context = runtime->GetContext();
-    v8::Context::Scope context_scope(context);
-
-    CallbackHandlers::WorkerObjectOnMessageCallback(isolate, workerId, msg);
-}
-
-extern "C" JNIEXPORT void Java_com_tns_Runtime_TerminateWorkerCallback(JNIEnv* env, jobject obj, jint runtimeId) {
-    // Worker Thread runtime
-    auto runtime = TryGetRuntime(runtimeId);
-    if (runtime == nullptr) {
-        // TODO: Pete: Log message informing the developer of the failure
-        return;
-    }
-
-    auto isolate = runtime->GetIsolate();
-
-    {
-        v8::Locker locker(isolate);
-        v8::Isolate::Scope isolate_scope(isolate);
-        v8::HandleScope handleScope(isolate);
-
-        CallbackHandlers::TerminateWorkerThread(isolate);
-
-        runtime->DestroyRuntime();
-    }
-
-    isolate->Dispose();
-
-    delete runtime;
-}
-
 extern "C" JNIEXPORT void Java_com_tns_Runtime_TerminateRuntimeCallback(JNIEnv* env, jobject obj, jint runtimeId) {
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {
@@ -424,6 +362,11 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_TerminateRuntimeCallback(JNIEnv*
 
     auto isolate = runtime->GetIsolate();
 
+    // Terminate this runtime's child workers before disposing the isolate. Their
+    // Worker object persistents live in this isolate, so they must be released
+    // first - mirrors WorkerWrapper::BackgroundLooper's nested-worker teardown.
+    WorkerWrapper::TerminateChildren(isolate);
+
     {
         v8::Locker locker(isolate);
         v8::Isolate::Scope isolate_scope(isolate);
@@ -437,46 +380,6 @@ extern "C" JNIEXPORT void Java_com_tns_Runtime_TerminateRuntimeCallback(JNIEnv*
     delete runtime;
 }
 
-extern "C" JNIEXPORT void Java_com_tns_Runtime_ClearWorkerPersistent(JNIEnv* env, jobject obj, jint runtimeId, jint workerId) {
-    // Worker Thread runtime
-    auto runtime = TryGetRuntime(runtimeId);
-    if (runtime == nullptr) {
-        // TODO: Pete: Log message informing the developer of the failure
-        return;
-    }
-
-    auto isolate = runtime->GetIsolate();
-
-    v8::Locker locker(isolate);
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handleScope(isolate);
-    auto context = runtime->GetContext();
-    v8::Context::Scope context_scope(context);
-
-    CallbackHandlers::ClearWorkerPersistent(workerId);
-}
-
-extern "C" JNIEXPORT void Java_com_tns_Runtime_CallWorkerObjectOnErrorHandleMain(JNIEnv* env, jobject obj, jint runtimeId, jint workerId, jstring message, jstring stackTrace, jstring filename, jint lineno, jstring threadName) {
-    // Main Thread runtime
-    auto runtime = TryGetRuntime(runtimeId);
-    if (runtime == nullptr) {
-        // TODO: Pete: Log message informing the developer of the failure
-        return;
-    }
-
-    auto isolate = runtime->GetIsolate();
-    v8::Locker locker(isolate);
-    v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handleScope(isolate);
-    auto context = runtime->GetContext();
-    v8::Context::Scope context_scope(context);
-
-    try {
-        CallbackHandlers::CallWorkerObjectOnErrorHandle(isolate, workerId, message, stackTrace, filename, lineno, threadName);
-    } catch (NativeScriptException& e) {
-        e.ReThrowToJava();
-    }
-}
 extern "C" JNIEXPORT void Java_com_tns_Runtime_ResetDateTimeConfigurationCache(JNIEnv* _env, jobject obj, jint runtimeId) {
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {

test-app/runtime/src/main/java/com/tns/Runtime.java

@@ -105,17 +105,8 @@ public static void SetManualInstrumentationMode(String mode) {
         }
     }
 
-    private static native void WorkerGlobalOnMessageCallback(int runtimeId, String message);
-
-    private static native void WorkerObjectOnMessageCallback(int runtimeId, int workerId, String message);
-
-    private static native void TerminateWorkerCallback(int runtimeId);
-
     private static native void TerminateRuntimeCallback(int runtimeId);
 
-    private static native void ClearWorkerPersistent(int runtimeId, int workerId);
-
-    private static native void CallWorkerObjectOnErrorHandleMain(int runtimeId, int workerId, String message, String stackTrace, String filename, int lineno, String threadName) throws NativeScriptException;
     private static native void ResetDateTimeConfigurationCache(int runtimeId);
 
     void passUncaughtExceptionToJs(Throwable ex, String message, String fullStackTrace, String jsStackTrace) {
@@ -475,30 +466,16 @@ static void destroyMainRuntime() {
             throw new NativeScriptException("Only the main NativeScript runtime can be destroyed with destroyMainRuntime().");
         }
 
-        runtime.isTerminating = true;
-        runtime.terminateWorkers();
         GcListener.unsubscribe(runtime);
         runtimeCache.remove(runtime.runtimeId);
-        pendingWorkerMessages.clear();
         currentRuntime.remove();
 
+        // Worker teardown happens natively in TerminateRuntimeCallback, which
+        // terminates this runtime's child workers (WorkerWrapper registry) before
+        // destroying the main isolate.
         TerminateRuntimeCallback(runtime.runtimeId);
     }
 
-    private void terminateWorkers() {
-        for (Handler workerHandler : new ArrayList<>(workerIdToHandler.values())) {
-            if (workerHandler == null) {
-                continue;
-            }
-
-            Message msg = Message.obtain();
-            msg.arg1 = MessageType.TerminateThread;
-            workerHandler.sendMessageAtFrontOfQueue(msg);
-        }
-
-        workerIdToHandler.clear();
-    }
-
     public int getWorkerId() {
         return workerId;
     }