feat: add Runtime::Free

Signed-off-by: Hosung Kim [email protected]

Author: hs0225

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

@@ -31,12 +31,6 @@ class Runtime::Internal {
   friend Runtime;
 
  public:
-  ~Internal() {
-    if (is_initialized && instance_) {
-      DisposeNode(instance_);
-    }
-  }
-
   std::pair<bool, int> Init(int argc, char** argv) {
     is_initialized = true;
     return InitializeNode(argc, argv, &instance_);
@@ -48,7 +42,12 @@ class Runtime::Internal {
     }
 
     return runner_.Run(*instance_);
-    ;
+  }
+
+  void Free() {
+    if (is_initialized && instance_) {
+      DisposeNode(instance_);
+    }
   }
 
  private:
@@ -72,6 +71,10 @@ std::pair<bool, int> Runtime::Init(int argc,
   return internal_->Init(argc, argv);
 }
 
+void Runtime::Free() {
+  return internal_->Free();
+}
+
 int Runtime::Run() {
   return internal_->Run();
 }

deps/node/src/node_main_lw.cc

@@ -90,8 +90,12 @@ int main(int argc, char* argv[]) {
   }
 
   if (init_result.first) {
+    runtime.Free();
     return init_result.second;
   }
 
-  return runtime.Run();
+  int result = runtime.Run();
+  runtime.Free();
+
+  return result;
 }

deps/node/src/node_main_lw_runner-inl.h

@@ -103,7 +103,7 @@ class LoopStrategy : public MainLoopStrategy {
 
 class LWNodeMainRunner {
  public:
-  ~LWNodeMainRunner() { v8::V8::ShutdownPlatform(); }
+  ~LWNodeMainRunner() {}
 
   int Run(node::NodeMainInstance& nodeMainInstance) {
     // To release array buffer allocator after node is finished,
@@ -178,6 +178,9 @@ class LWNodeMainRunner {
 #if defined(LEAK_SANITIZER)
     __lsan_do_leak_check();
 #endif
+
+    v8::V8::ShutdownPlatform();
+
     return exit_code;
   }
 

include/lwnode/lwnode-public.h

@@ -59,6 +59,8 @@ class LWNODE_EXPORT Runtime {
   // initialized.
   int Run();
 
+  void Free();
+
   std::shared_ptr<Port> GetPort();
 
  private:

test/embedding/embedtest.cc

@@ -28,7 +28,7 @@ std::string getTimestamp() {
 }
 
 TEST0(Embedtest, MessagePort2_Post_Many_JS_First) {
-  auto runtime = new lwnode::Runtime();
+  auto runtime = std::make_shared<lwnode::Runtime>();
 
   std::promise<void> promise;
   std::future<void> init_future = promise.get_future();
@@ -44,6 +44,7 @@ TEST0(Embedtest, MessagePort2_Post_Many_JS_First) {
       [&](std::promise<void>&& promise) mutable {
         runtime->Init(COUNT_OF(args), args, std::move(promise));
         runtime->Run();
+        runtime->Free();
       },
       std::move(promise));
 

test/embedding/example.cc

@@ -9,9 +9,7 @@
 #define COUNT_OF(array) (sizeof(array) / sizeof((array)[0]))
 
 int main(int argc, char* argv[]) {
-  // FIXME: Fix to ensure the runtime is deleted without crashing.
-  // auto runtime = std::make_shared<lwnode::Runtime>();
-  auto runtime = new lwnode::Runtime();
+  auto runtime = std::make_shared<lwnode::Runtime>();
 
   std::promise<void> promise;
   std::future<void> init_future = promise.get_future();
@@ -26,6 +24,7 @@ int main(int argc, char* argv[]) {
         // promise directly to know when that is.
         runtime->Init(COUNT_OF(args), args, std::move(promise));
         runtime->Run();
+        runtime->Free();
       },
       std::move(promise));