fix: fix multiple Node::Start executions in a process

Signed-off-by: Hosung Kim hs852.kim@samsung.com

Author: hs0225

deps/node/src/lwnode/lwnode-public.cc

@@ -48,11 +48,11 @@ class Runtime::Internal {
 
   std::pair<bool, int> Init(int argc, char** argv) {
     if (state_ != State::kNotInitialized) {
-      LWNODE_DEV_LOG("[Runtime::Init] already initialized");
+      LWNODE_DEV_LOG("[Runtime::Internal::Init] already initialized");
       return std::make_pair(false, -1);
     }
 
-    LWNODE_DEV_LOG("[Runtime::Init]");
+    LWNODE_DEV_LOG("[Runtime::Internal::Init]");
     state_ = State::kInitialized;
 
     // Set sendMessageSync callback to isolate context embedder data.
@@ -72,12 +72,12 @@ class Runtime::Internal {
 
   int Run() {
     if (state_ != State::kInitialized) {
-      LWNODE_DEV_LOG("[Runtime::Run] not initialized");
+      LWNODE_DEV_LOG("[Runtime::Internal::Run] not initialized");
       return -1;
     }
 
     CHECK_NOT_NULL(instance_);
-    LWNODE_DEV_LOG("[Runtime::Run]");
+    LWNODE_DEV_LOG("[Runtime::Internal::Run]");
     state_ = State::kRunning;
 
     int result = runner_.Run(*instance_);
@@ -89,26 +89,26 @@ class Runtime::Internal {
 
   void Stop() {
     if (state_ != State::kRunning) {
-      LWNODE_DEV_LOG("[Runtime::Stop] already stopped");
+      LWNODE_DEV_LOG("[Runtime::Internal::Stop] already stopped");
       return;
     }
 
     CHECK_NOT_NULL(instance_);
-    LWNODE_DEV_LOG("[Runtime::Stop]");
+    LWNODE_DEV_LOG("[Runtime::Internal::Stop]");
     state_ = State::kStopped;
 
     runner_.Stop();
   }
 
   void Free() {
     if (state_ != State::kStopped && state_ != State::kInitialized) {
-      LWNODE_DEV_LOG("[Runtime::Free] not stopped");
+      LWNODE_DEV_LOG("[Runtime::Internal::Free] not stopped");
       return;
     }
 
     state_ = State::kReleased;
     if (instance_) {
-      LWNODE_DEV_LOG("[Runtime::Free]");
+      LWNODE_DEV_LOG("[Runtime::Internal::Free]");
       DisposeNode(instance_);
     }
 

deps/node/src/node.cc

@@ -831,7 +831,10 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
                            std::vector<std::string>* exec_argv,
                            std::vector<std::string>* errors) {
   // Make sure InitializeNodeWithArgs() is called only once.
-  CHECK(!init_called.exchange(true));
+  // CHECK(!init_called.exchange(true)); @lwnode
+  if (node_is_initialized) {
+    return 0;
+  }
 
   // Initialize node_start_time to get relative uptime.
   per_process::node_start_time = uv_hrtime();

include/lwnode/lwnode-version.h

@@ -18,5 +18,5 @@
 
  #define LWNODE_VERSION_MAJOR 1
  #define LWNODE_VERSION_MINOR 0
- #define LWNODE_VERSION_PATCH 0
- #define LWNODE_VERSION_TAG "v1.0.0"
+ #define LWNODE_VERSION_PATCH 1
+ #define LWNODE_VERSION_TAG "v1.0.1"

src/api/engine.cc

@@ -40,6 +40,7 @@ Platform* Platform::GetInstance() {
 void Platform::Dispose() {
   LWNODE_CALL_TRACE_GC_START();
   // s_platform is freed in Escargot::PlatformBridge
+  s_platform = nullptr;
   LWNODE_CALL_TRACE_GC_END();
 }
 

test/embedding/embedtest.cc

@@ -73,3 +73,30 @@ TEST0(Embedtest, MessagePort2_Post_Many_JS_First) {
 
   EXPECT_EQ(count1, 10);
 }
+
+TEST0(Embedtest, Restart) {
+  int count = 0;
+  for (int i = 0; i < 3; i++) {
+    auto runtime = std::make_shared<lwnode::Runtime>();
+
+    std::promise<void> promise;
+    std::future<void> init_future = promise.get_future();
+    const char* script = "test/embedding/test-21-runtime-hello.js";
+    std::string path = (std::filesystem::current_path() / script).string();
+
+    char* args[] = {const_cast<char*>(""), const_cast<char*>(path.c_str())};
+
+    std::thread worker = std::thread(
+        [&](std::promise<void>&& promise) mutable {
+          std::cout << ++count << " Start " << std::endl;
+          runtime->Start(COUNT_OF(args), args, std::move(promise));
+          std::cout << count << " /Start " << std::endl;
+        },
+        std::move(promise));
+
+    init_future.wait();
+    worker.join();
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+  }
+  EXPECT_EQ(count, 3);
+}

test/embedding/test-21-runtime-hello.js

@@ -0,0 +1 @@
+console.log('hello world!');