feat(runtime): add start function

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

Author: hs0225

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

@@ -64,19 +64,19 @@ Runtime::~Runtime() {
   delete internal_;
 }
 
-std::pair<bool, int> Runtime::Init(int argc,
-                                   char** argv,
-                                   std::promise<void>&& promise) {
+int Runtime::Start(int argc, char** argv, std::promise<void>&& promise) {
   internal_->runner_.SetInitPromise(std::move(promise));
-  return internal_->Init(argc, argv);
-}
+  std::pair<bool, int> init_result = internal_->Init(argc, argv);
 
-void Runtime::Free() {
-  return internal_->Free();
-}
+  if (init_result.first) {
+    internal_->Free();
+    return init_result.second;
+  }
 
-int Runtime::Run() {
-  return internal_->Run();
+  int result = internal_->Run();
+  internal_->Free();
+
+  return result;
 }
 
 std::shared_ptr<Port> Runtime::GetPort() {

deps/node/src/node_main_lw.cc

@@ -72,7 +72,8 @@ int main(int argc, char* argv[]) {
   setvbuf(stderr, nullptr, _IONBF, 0);
 
   lwnode::Runtime runtime;
-  std::pair<bool, int> init_result; // early_return, exit_code
+  std::pair<bool, int> init_result;  // early_return, exit_code
+
   // FIXME: Fix Runtime::Init() call to ensure environment initialization
   // before running the loop, Runtime::Run(). This workaround passes a
   // promise directly to know when that is.
@@ -82,20 +83,12 @@ int main(int argc, char* argv[]) {
     if (!lwnode::InitScriptRootPath()) {
       exit(-errno);
     }
-    char* args[] = {"", "index.js", nullptr};
-    init_result = runtime.Init(2, args, std::move(promise));
-  } else {
-    // started by command line
-    init_result = runtime.Init(argc, argv, std::move(promise));
-  }
 
-  if (init_result.first) {
-    runtime.Free();
-    return init_result.second;
+    char* args[] = {
+        const_cast<char*>(""), const_cast<char*>("index.js"), nullptr};
+    return runtime.Start(2, args, std::move(promise));
   }
 
-  int result = runtime.Run();
-  runtime.Free();
-
-  return result;
+  // started by command line
+  return runtime.Start(argc, argv, std::move(promise));
 }

include/lwnode/lwnode-public.h

@@ -31,35 +31,39 @@ namespace lwnode {
 
 LWNODE_EXPORT bool ParseAULEvent(int argc, char** argv);
 
-// Sets the path of the root directory of the JavaScript. If you do
-// not put the path argument, the root path is the app's resource path by
-// default on Tizen AUL mode. Be sure to call this function before lwnode::Start
-// function.
+/**
+ * Sets the path of the root directory of the JavaScript. If you do
+ * not put the path argument, the root path is the app's resource path by
+ * default on Tizen AUL mode. Be sure to call this function before lwnode::Start
+ * function. 
+ **/
 LWNODE_EXPORT bool InitScriptRootPath(const std::string path = "");
 
 LWNODE_EXPORT int Start(int argc, char** argv);
 
-// Sets the dlog tag id for debugging. This is only used on Tizen when not in
-// AUL mode.
+/**
+ * Sets the dlog tag id for debugging. This is only used on Tizen when not in
+ * AUL mode. 
+ **/
 LWNODE_EXPORT void SetDlogID(const std::string& appId);
 
 class LWNODE_EXPORT Runtime {
  public:
   Runtime();
   ~Runtime();
 
-  // Initializes the runtime and returns true if it early termination and sets
-  // the exit code to the second return value. Otherwise, it returns false
-  // and you need call Run() to run the runtime.
-  std::pair<bool, int> Init(int argc,
-                            char** argv,
-                            std::promise<void>&& promise);
-
-  // Runs the runtime and returns the exit code. The runtime must be
-  // initialized.
-  int Run();
-
-  void Free();
+  /**
+  * Start the runtime and returns the exit code. It initializes the runtime
+  * and runs it. When the runtime is initialized, the promise object is set.
+  * 
+  * @param argc - Argument count.
+  * @param argv - Argument vector. The element should be the starting file
+  * name of the application.
+  * @param promise - Promise object. It will be set when the runtime
+  * initialization is complete.
+  * @return Returns the exit code of the runtime.
+  **/
+  int Start(int argc, char** argv, std::promise<void>&& promise);
 
   std::shared_ptr<Port> GetPort();
 

test/embedding/embedtest.cc

@@ -42,9 +42,7 @@ TEST0(Embedtest, MessagePort2_Post_Many_JS_First) {
 
   std::thread worker = std::thread(
       [&](std::promise<void>&& promise) mutable {
-        runtime->Init(COUNT_OF(args), args, std::move(promise));
-        runtime->Run();
-        runtime->Free();
+        runtime->Start(COUNT_OF(args), args, std::move(promise));
       },
       std::move(promise));
 

test/embedding/example.cc

@@ -22,9 +22,7 @@ int main(int argc, char* argv[]) {
         // FIXME: Fix Runtime::Init() call to ensure environment initialization
         // before running the loop, Runtime::Run(). This workaround passes a
         // promise directly to know when that is.
-        runtime->Init(COUNT_OF(args), args, std::move(promise));
-        runtime->Run();
-        runtime->Free();
+        runtime->Start(COUNT_OF(args), args, std::move(promise));
       },
       std::move(promise));