Added v8 locking

Author: vtrifonov

test-app/app/src/debug/java/com/tns/NativeScriptSyncServiceSocketImpl.java

@@ -356,11 +356,14 @@ private void createOrOverrideFile(String fileName, byte[] content) throws IOExce
 
                 fileToCreate.getParentFile().mkdirs();
                 FileOutputStream fos = new FileOutputStream(fileToCreate.getCanonicalPath());
+                runtime.lock();
                 fos.write(content);
                 fos.close();
 
             } catch (Exception e) {
                 throw new IOException(String.format("\nLiveSync: failed to write file: %s\nOriginal Exception: %s", fileName, e.toString()));
+            } finally {
+                runtime.unlock();
             }
         }
 

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

@@ -188,6 +188,14 @@ void Runtime::Init(jstring filesPath, jstring nativeLibDir, bool verboseLoggingE
     s_isolate2RuntimesCache.insert(make_pair(m_isolate, this));
 }
 
+void Runtime::Lock() {
+    m_locker.reset(new v8::Locker(m_isolate));
+}
+
+void Runtime::Unlock() {
+    m_locker.reset(nullptr);
+}
+
 void Runtime::RunModule(JNIEnv* _env, jobject obj, jstring scriptFile) {
     JEnv env(_env);
 

test-app/runtime/src/main/cpp/Runtime.h

@@ -56,7 +56,11 @@ class Runtime {
         void ClearStartupData(JNIEnv* env, jobject obj);
         void DestroyRuntime();
 
+        void Lock();
+        void Unlock();
+
         static v8::Platform* platform;
+        std::auto_ptr<v8::Locker> m_locker;
 
     private:
         Runtime(JNIEnv* env, jobject runtime, int id);

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

@@ -231,6 +231,20 @@ extern "C" JNIEXPORT jboolean Java_com_tns_Runtime_notifyGc(JNIEnv* env, jobject
     return success;
 }
 
+extern "C" JNIEXPORT void Java_com_tns_Runtime_lock(JNIEnv* env, jobject obj, jint runtimeId) {
+    auto runtime = TryGetRuntime(runtimeId);
+    if (runtime != nullptr) {
+        runtime->Lock();
+    }
+}
+
+extern "C" JNIEXPORT void Java_com_tns_Runtime_unlock(JNIEnv* env, jobject obj, jint runtimeId) {
+    auto runtime = TryGetRuntime(runtimeId);
+    if (runtime != nullptr) {
+        runtime->Unlock();
+    }
+}
+
 extern "C" JNIEXPORT void Java_com_tns_Runtime_passUncaughtExceptionToJsNative(JNIEnv* env, jobject obj, jint runtimeId, jthrowable exception, jstring stackTrace) {
     auto runtime = TryGetRuntime(runtimeId);
     if (runtime == nullptr) {

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

@@ -48,6 +48,8 @@ private native void initNativeScript(int runtimeId, String filesPath, String nat
     private native int generateNewObjectId(int runtimeId);
 
     private native boolean notifyGc(int runtimeId);
+    private native void lock(int runtimeId);
+    private native void unlock(int runtimeId);
 
     private native void passUncaughtExceptionToJsNative(int runtimeId, Throwable ex, String stackTrace);
 
@@ -602,9 +604,9 @@ private long getUsedMemory() {
         return usedMemory;
     }
 
-    public void notifyGc() {
-        notifyGc(runtimeId);
-    }
+    public void notifyGc() { notifyGc(runtimeId); }
+    public void lock() { lock(runtimeId); }
+    public void unlock() { unlock(runtimeId); }
 
     public static void initInstance(Object instance) {
         ManualInstrumentation.Frame frame = ManualInstrumentation.start("Runtime.initInstance");