opt(eventx,main):1.10.20

1. 优化ThreadPool,减少主线程join()等待时长;
2. 优化main框架，重命名loop_exit_wait与error_exit_wait两个参数为exit_wait_sec与is_fault_hup

Author: hevake

modules/eventx/thread_pool.cpp

@@ -289,6 +289,8 @@ ThreadPool::Snapshot ThreadPool::snapshot() const
 
 void ThreadPool::threadProc(ThreadToken thread_token)
 {
+    bool let_main_loop_join_me = false;
+
     LogDbg("thread %u start", thread_token.id());
 
     while (true) {
@@ -301,13 +303,7 @@ void ThreadPool::threadProc(ThreadToken thread_token)
              */
             if ((d_->idle_thread_num >= d_->undo_tasks_cabinet.size()) && (d_->threads_cabinet.size() > d_->min_thread_num)) {
                 LogDbg("thread %u will exit, no more work.", thread_token.id());
-                //! 则将线程取出来，交给main_loop去join()，然后delete
-                auto t = d_->threads_cabinet.free(thread_token);
-                if (t != nullptr)   //! 如果取得到，说明还没有被cleanup()
-                    d_->wp_loop->runInLoop(
-                        [t]{ t->join(); delete t; },
-                        "ThreadPool::threadProc, join and delete t"
-                    );
+                let_main_loop_join_me = true;
                 break;
             }
 
@@ -370,6 +366,17 @@ void ThreadPool::threadProc(ThreadToken thread_token)
     }
 
     LogDbg("thread %u exit", thread_token.id());
+
+    if (let_main_loop_join_me) {
+        //! 则将线程取出来，交给main_loop去join()，然后delete
+        auto t = d_->threads_cabinet.free(thread_token);
+        TBOX_ASSERT(t != nullptr);
+        d_->wp_loop->runInLoop(
+            [t]{ t->join(); delete t; },
+            "ThreadPool::threadProc, join and delete it"
+        );
+        //! 这个操作放到最后来做是为了减少主线程join()的等待时长
+    }
 }
 
 bool ThreadPool::createWorker()

modules/eventx/work_thread.cpp

@@ -189,6 +189,8 @@ int WorkThread::cancel(TaskToken token)
 
 void WorkThread::threadProc()
 {
+    LogDbg("thread start");
+
     while (true) {
         Task* item = nullptr;
         {

modules/main/run_in_backend.cpp

@@ -58,8 +58,8 @@ struct Runtime {
     Module apps;
 
     util::PidFile pid_file;
-    int loop_exit_wait = 1;
-    bool error_exit_wait = false;
+    int exit_wait_sec = 1;
+    bool is_fault_hup = false;
     std::thread thread;
 
     Runtime() : apps("", ctx) {
@@ -146,19 +146,24 @@ bool Start(int argc, char **argv)
         }
     }
 
-    util::json::GetField(js_conf, "loop_exit_wait", _runtime->loop_exit_wait);
-    util::json::GetField(js_conf, "error_exit_wait", _runtime->error_exit_wait);
+    util::json::GetField(js_conf, "exit_wait_sec", _runtime->exit_wait_sec);
+    util::json::GetField(js_conf, "is_fault_hup", _runtime->is_fault_hup);  //! 出现错误的时候是否需要挂起
 
     trace.initialize(ctx, js_conf);
     log.initialize(argv[0], ctx, js_conf);
     LogOutput_Disable();
 
     SayHi();
 
+    //! 注册异常退出时的动作，在异常信号触发时调用
     error_exit_func = [&] {
+        if (_runtime->is_fault_hup)
+            LogNotice("process is hup.");
+
+        //! 主要是保存日志
         log.cleanup();
 
-        while (_runtime->error_exit_wait)
+        while (_runtime->is_fault_hup)
             std::this_thread::sleep_for(std::chrono::seconds(1));
     };
 
@@ -201,8 +206,8 @@ void Stop()
         [] {
             _runtime->apps.stop();
             _runtime->ctx.stop();
-            _runtime->ctx.loop()->exitLoop(std::chrono::seconds(_runtime->loop_exit_wait));
-            LogDbg("Loop will exit after %d sec", _runtime->loop_exit_wait);
+            _runtime->ctx.loop()->exitLoop(std::chrono::seconds(_runtime->exit_wait_sec));
+            LogDbg("Loop will exit after %d sec", _runtime->exit_wait_sec);
         },
         "main::Stop"
     );

modules/main/run_in_frontend.cpp

@@ -52,7 +52,7 @@ extern void SayBye();
 extern std::function<void()> error_exit_func;
 
 namespace {
-void RunInFrontend(ContextImp &ctx, Module &apps, int loop_exit_wait)
+void RunInFrontend(ContextImp &ctx, Module &apps, int exit_wait_sec)
 {
     auto stop_signal = ctx.loop()->newSignalEvent("main::RunInFrontend::stop_signal");
     auto warn_signal = ctx.loop()->newSignalEvent("main::RunInFrontend::warn_signal");
@@ -71,8 +71,8 @@ void RunInFrontend(ContextImp &ctx, Module &apps, int loop_exit_wait)
             LogImportant("Got signal %d, stop", signo);
             apps.stop();
             ctx.stop();
-            ctx.loop()->exitLoop(std::chrono::seconds(loop_exit_wait));
-            LogDbg("Loop will exit after %d sec", loop_exit_wait);
+            ctx.loop()->exitLoop(std::chrono::seconds(exit_wait_sec));
+            LogDbg("Loop will exit after %d sec", exit_wait_sec);
         }
     );
 
@@ -131,11 +131,11 @@ int Main(int argc, char **argv)
         }
     }
 
-    int loop_exit_wait = 1;
-    util::json::GetField(js_conf, "loop_exit_wait", loop_exit_wait);
+    int exit_wait_sec = 1;
+    util::json::GetField(js_conf, "exit_wait_sec", exit_wait_sec);
 
-    bool error_exit_wait = false;
-    util::json::GetField(js_conf, "error_exit_wait", error_exit_wait);
+    bool is_fault_hup = false;
+    util::json::GetField(js_conf, "is_fault_hup", is_fault_hup);  //! 出现错误的时候是否需要挂起
 
     trace.initialize(ctx, js_conf);
     log.initialize(argv[0], ctx, js_conf);
@@ -145,17 +145,20 @@ int Main(int argc, char **argv)
 
     //! 注册异常退出时的动作，在异常信号触发时调用
     error_exit_func = [&] {
+        if (is_fault_hup)
+            LogNotice("process is hup.");
+
         //! 主要是保存日志
         log.cleanup();
 
-        while (error_exit_wait)
+        while (is_fault_hup)
             std::this_thread::sleep_for(std::chrono::seconds(1));
     };
 
     if (ctx.initialize(argv[0], js_conf)) {
         if (apps.initialize(js_conf)) {
             if (ctx.start() && apps.start()) {  //! 启动所有应用
-                RunInFrontend(ctx, apps, loop_exit_wait);
+                RunInFrontend(ctx, apps, exit_wait_sec);
             } else {
                 LogErr("Apps start fail");
             }

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 10
-TBOX_VERSION_REVISION := 19
+TBOX_VERSION_REVISION := 20