Improve locking

Author: vtrifonov

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

@@ -19,6 +19,7 @@
 #include "ManualInstrumentation.h"
 #include "Runtime.h"
 #include <sstream>
+#include <mutex>
 #include <libgen.h>
 #include <dlfcn.h>
 
@@ -429,11 +430,11 @@ Local<Object> ModuleInternal::LoadData(Isolate* isolate, const string& path) {
 
 Local<String> ModuleInternal::WrapModuleContent(const string& path) {
     TNSPERF();
-    Runtime::GetRuntime(m_isolate)->Lock();
-    string content = File::ReadText(path);
-    Runtime::GetRuntime(m_isolate)->Unlock();
 
-    auto separatorIndex = path.find_last_of("/");
+#ifdef APPLICATION_IN_DEBUG
+    std::lock_guard<std::mutex> lock(Runtime::GetRuntime(m_isolate)->GetFileWriteMutex());
+#endif
+    string content = File::ReadText(path);
 
     // TODO: Use statically allocated buffer for better performance
     string result(MODULE_PROLOGUE);

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

@@ -189,15 +189,21 @@ void Runtime::Init(jstring filesPath, jstring nativeLibDir, bool verboseLoggingE
     s_isolate2RuntimesCache.insert(make_pair(m_isolate, this));
 }
 
+#ifdef APPLICATION_IN_DEBUG
+std::mutex& Runtime::GetFileWriteMutex() {
+    return m_fileWriteMutex;
+}
+#endif
+
 void Runtime::Lock() {
 #ifdef APPLICATION_IN_DEBUG
-    m_fileWriteLock.reset(new std::lock_guard<std::mutex>(m_fileWriteMutex));
+    m_fileWriteMutex.lock();
 #endif
 }
 
 void Runtime::Unlock() {
 #ifdef APPLICATION_IN_DEBUG
-    m_fileWriteLock.reset(nullptr);
+    m_fileWriteMutex.unlock();
 #endif
 }
 

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

@@ -61,8 +61,10 @@ class Runtime {
         void Unlock();
 
         static v8::Platform* platform;
-        std::auto_ptr<std::lock_guard<std::mutex>> m_fileWriteLock;
-        std::mutex m_fileWriteMutex;
+
+#ifdef APPLICATION_IN_DEBUG
+        std::mutex& GetFileWriteMutex();
+#endif
 
     private:
         Runtime(JNIEnv* env, jobject runtime, int id);
@@ -104,6 +106,10 @@ class Runtime {
         static jmethodID GET_USED_MEMORY_METHOD_ID;
 
         static bool s_mainThreadInitialized;
+
+#ifdef APPLICATION_IN_DEBUG
+        std::mutex m_fileWriteMutex;
+#endif
 };
 }