Merge pull request #1133 from NativeScript/trifonov/v8-lock

Lock files for reading when they are being replaced

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/app/src/main/java/com/tns/RuntimeHelper.java

@@ -192,7 +192,18 @@ public static Runtime initRuntime(Application app) {
 
                     // if app is in debuggable mode run livesync service
                     // runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
-                    // initLiveSync(runtime, logger, app);
+                    initLiveSync(runtime, logger, app);
+
+                    // CLI will create this file when initial sync is needed and then will remove it after syncing the fails and restarting the app
+                    File liveSyncFile = new File("/data/local/tmp/" + app.getPackageName() + "-livesync-in-progress");
+                    if(liveSyncFile.exists()) {
+                        try {
+                            // wait for the livesync to complete
+                            Thread.sleep(30000);
+                        } catch (Exception ex) {
+
+                        }
+                    }
                 }
 
                 runtime.runScript(new File(appDir, "internal/ts_helpers.js"));

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java

@@ -655,9 +655,9 @@ private void writeMethodBody(Method m, boolean isConstructor, boolean isApplicat
         }
 
         // call liveSync initialization
-        if (m.getName().equals("onCreate") && isActivityClass) {
-            w.writeln("\t\tcom.tns.RuntimeHelper.initLiveSync(this.getApplication());");
-        }
+//        if (m.getName().equals("onCreate") && isActivityClass) {
+//            w.writeln("\t\tcom.tns.RuntimeHelper.initLiveSync(this.getApplication());");
+//        }
     }
 
     private void writeType(Type t, Writer w) {

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

@@ -17,7 +17,9 @@
 #include "include/v8.h"
 #include "CallbackHandlers.h"
 #include "ManualInstrumentation.h"
+#include "Runtime.h"
 #include <sstream>
+#include <mutex>
 #include <libgen.h>
 #include <dlfcn.h>
 
@@ -397,7 +399,7 @@ Local<Object> ModuleInternal::LoadData(Isolate* isolate, const string& path) {
     tns::instrumentation::Frame frame(frameName.c_str());
     Local<Object> json;
 
-    auto jsonData = File::ReadText(path);
+    auto jsonData = Runtime::GetRuntime(m_isolate)->ReadFileText(path);
 
     TryCatch tc(isolate);
 
@@ -428,9 +430,8 @@ Local<Object> ModuleInternal::LoadData(Isolate* isolate, const string& path) {
 
 Local<String> ModuleInternal::WrapModuleContent(const string& path) {
     TNSPERF();
-    string content = File::ReadText(path);
 
-    auto separatorIndex = path.find_last_of("/");
+    string content = Runtime::GetRuntime(m_isolate)->ReadFileText(path);
 
     // TODO: Use statically allocated buffer for better performance
     string result(MODULE_PROLOGUE);

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

@@ -22,6 +22,7 @@
 #include "include/zipconf.h"
 #include <csignal>
 #include <sstream>
+#include <mutex>
 #include <dlfcn.h>
 #include <console/Console.h>
 #include "NetworkDomainCallbackHandlers.h"
@@ -188,6 +189,26 @@ void Runtime::Init(jstring filesPath, jstring nativeLibDir, bool verboseLoggingE
     s_isolate2RuntimesCache.insert(make_pair(m_isolate, this));
 }
 
+std::string Runtime::ReadFileText(const std::string& filePath) {
+#ifdef APPLICATION_IN_DEBUG
+    std::lock_guard<std::mutex> lock(m_fileWriteMutex);
+#endif
+    return File::ReadText(filePath);
+}
+
+
+void Runtime::Lock() {
+#ifdef APPLICATION_IN_DEBUG
+    m_fileWriteMutex.lock();
+#endif
+}
+
+void Runtime::Unlock() {
+#ifdef APPLICATION_IN_DEBUG
+    m_fileWriteMutex.unlock();
+#endif
+}
+
 void Runtime::RunModule(JNIEnv* _env, jobject obj, jstring scriptFile) {
     JEnv env(_env);
 
@@ -209,7 +230,8 @@ jobject Runtime::RunScript(JNIEnv* _env, jobject obj, jstring scriptFile) {
     auto context = isolate->GetCurrentContext();
 
     auto filename = ArgConverter::jstringToString(scriptFile);
-    auto src = File::ReadText(filename);
+    auto src = ReadFileText(filename);
+
     auto source = ArgConverter::ConvertToV8String(isolate, src);
 
     TryCatch tc(isolate);
@@ -476,7 +498,7 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native
 
             // check for custom script to include in the snapshot
             if (Constants::V8_HEAP_SNAPSHOT_SCRIPT.size() > 0 && File::Exists(Constants::V8_HEAP_SNAPSHOT_SCRIPT)) {
-                customScript = File::ReadText(Constants::V8_HEAP_SNAPSHOT_SCRIPT);
+                customScript = ReadFileText(Constants::V8_HEAP_SNAPSHOT_SCRIPT);
             }
 
             DEBUG_WRITE_FORCE("Creating heap snapshot");

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

@@ -10,6 +10,7 @@
 #include "Profiler.h"
 #include "ModuleInternal.h"
 #include "File.h"
+#include <mutex>
 
 jobject ConvertJsValueToJavaObject(tns::JEnv& env, const v8::Local<v8::Value>& value, int classReturnType);
 
@@ -56,8 +57,13 @@ class Runtime {
         void ClearStartupData(JNIEnv* env, jobject obj);
         void DestroyRuntime();
 
+        void Lock();
+        void Unlock();
+
         static v8::Platform* platform;
 
+        std::string ReadFileText(const std::string& filePath);
+
     private:
         Runtime(JNIEnv* env, jobject runtime, int id);
 
@@ -98,6 +104,10 @@ class Runtime {
         static jmethodID GET_USED_MEMORY_METHOD_ID;
 
         static bool s_mainThreadInitialized;
+
+#ifdef APPLICATION_IN_DEBUG
+        std::mutex m_fileWriteMutex;
+#endif
 };
 }
 

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);
 
@@ -610,9 +612,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");
@@ -643,6 +645,8 @@ private void createJSInstance(Object instance) {
             if (jsImpl != null) {
                 File jsFile = new File(jsImpl.javaScriptFile());
                 runModule(jsFile);
+            } else {
+                logger.write("Couldn't find JavaScriptImplementation annotation for class " + clazz.toString());
             }
             loadedJavaScriptExtends.put(clazz, jsImpl);
         }