feat(base):1.13.9,修改CatchThrow()，添加tag

Author: hevake

examples/main/07_stop_process/Makefile

@@ -0,0 +1,43 @@
+#
+#     .============.
+#    //  M A K E  / \
+#   //  C++ DEV  /   \
+#  //  E A S Y  /  \/ \
+# ++ ----------.  \/\  .
+#  \\     \     \ /\  /
+#   \\     \     \   /
+#    \\     \     \ /
+#     -============'
+#
+# Copyright (c) 2018 Hevake and contributors, all rights reserved.
+#
+# This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+# Use of this source code is governed by MIT license that can be found
+# in the LICENSE file in the root of the source tree. All contributing
+# project authors may be found in the CONTRIBUTORS.md file in the root
+# of the source tree.
+#
+
+PROJECT := examples/main/07_stop_process
+EXE_NAME := ${PROJECT}
+
+CPP_SRC_FILES = app.cpp main.cpp
+
+CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
+LDFLAGS += \
+	-ltbox_main \
+	-ltbox_coroutine \
+	-ltbox_trace \
+	-ltbox_terminal \
+	-ltbox_network \
+	-ltbox_eventx \
+	-ltbox_eventx \
+	-ltbox_event \
+	-ltbox_log \
+	-ltbox_util \
+	-ltbox_base \
+	-lpthread \
+	-ldl \
+	-rdynamic
+
+include $(TOP_DIR)/mk/exe_common.mk

examples/main/07_stop_process/app.cpp

@@ -0,0 +1,37 @@
+/*
+ *     .============.
+ *    //  M A K E  / \
+ *   //  C++ DEV  /   \
+ *  //  E A S Y  /  \/ \
+ * ++ ----------.  \/\  .
+ *  \\     \     \ /\  /
+ *   \\     \     \   /
+ *    \\     \     \ /
+ *     -============'
+ *
+ * Copyright (c) 2018 Hevake and contributors, all rights reserved.
+ *
+ * This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+ * Use of this source code is governed by MIT license that can be found
+ * in the LICENSE file in the root of the source tree. All contributing
+ * project authors may be found in the CONTRIBUTORS.md file in the root
+ * of the source tree.
+ */
+#include "app.h"
+#include <tbox/base/log.h>
+#include <tbox/main/main.h>
+
+App::App(tbox::main::Context &ctx) :
+    Module("app", ctx)
+{ }
+
+bool App::onStart()
+{
+    LogInfo("process will exit after 5 sec");
+    ctx().timer_pool()->doAfter(std::chrono::seconds(5),
+        [this] {
+            tbox::main::RaiseStopSignal();
+        }
+    );
+    return true;
+}

examples/main/07_stop_process/app.h

@@ -0,0 +1,34 @@
+/*
+ *     .============.
+ *    //  M A K E  / \
+ *   //  C++ DEV  /   \
+ *  //  E A S Y  /  \/ \
+ * ++ ----------.  \/\  .
+ *  \\     \     \ /\  /
+ *   \\     \     \   /
+ *    \\     \     \ /
+ *     -============'
+ *
+ * Copyright (c) 2018 Hevake and contributors, all rights reserved.
+ *
+ * This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+ * Use of this source code is governed by MIT license that can be found
+ * in the LICENSE file in the root of the source tree. All contributing
+ * project authors may be found in the CONTRIBUTORS.md file in the root
+ * of the source tree.
+ */
+#ifndef TBOX_MAIN_EXAMPLE_SAMPLE_H_20211226
+#define TBOX_MAIN_EXAMPLE_SAMPLE_H_20211226
+
+#include <tbox/main/main.h>
+
+class App : public tbox::main::Module
+{
+  public:
+    App(tbox::main::Context &ctx);
+
+  protected:
+    virtual bool onStart() override;
+};
+
+#endif //TBOX_MAIN_EXAMPLE_SAMPLE_H_20211226

examples/main/07_stop_process/main.cpp

@@ -0,0 +1,32 @@
+/*
+ *     .============.
+ *    //  M A K E  / \
+ *   //  C++ DEV  /   \
+ *  //  E A S Y  /  \/ \
+ * ++ ----------.  \/\  .
+ *  \\     \     \ /\  /
+ *   \\     \     \   /
+ *    \\     \     \ /
+ *     -============'
+ *
+ * Copyright (c) 2018 Hevake and contributors, all rights reserved.
+ *
+ * This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+ * Use of this source code is governed by MIT license that can be found
+ * in the LICENSE file in the root of the source tree. All contributing
+ * project authors may be found in the CONTRIBUTORS.md file in the root
+ * of the source tree.
+ */
+#include <tbox/main/main.h>
+#include "app.h"
+
+namespace tbox {
+namespace main {
+
+void RegisterApps(Module &apps, Context &ctx)
+{
+    apps.add(new ::App(ctx));
+}
+
+}
+}

modules/base/catch_throw.cpp

@@ -51,7 +51,7 @@ void CatchType()
 
 }
 
-bool CatchThrow(const std::function<void()> &func,
+bool CatchThrow(const std::function<void()> &func, const char *tag,
                 bool print_backtrace, bool abort_process) noexcept
 {
     try {
@@ -61,22 +61,22 @@ bool CatchThrow(const std::function<void()> &func,
 
     } catch (const std::exception &e) {
         CatchType();
-        LogWarn("what(): %s", e.what());
+        LogWarn("'%s' what(): %s", tag, e.what());
     } catch (const char *e) {
         CatchType();
-        LogWarn("value: %s", e);
+        LogWarn("'%s' value: %s", tag, e);
     } catch (int e) {
         CatchType();
-        LogWarn("value: %d", e);
+        LogWarn("'%s' value: %d", tag, e);
     } catch (double e) {
         CatchType();
-        LogWarn("value: %f", e);
+        LogWarn("'%s' value: %f", tag, e);
     } catch (const std::string &e) {
         CatchType();
-        LogWarn("value: %s", e.c_str());
+        LogWarn("'%s' value: %s", tag, e.c_str());
     } catch (...) {
         CatchType();
-        LogWarn("can't print value");
+        LogWarn("'%s' can't print value", tag);
     }
 
     if (print_backtrace) {

modules/base/catch_throw.h

@@ -34,6 +34,7 @@ namespace tbox {
  * \return true     运行过程中捕获到了异常
  */
 bool CatchThrow(const std::function<void()> &func,
+                const char *tag = "?",
                 bool print_backtrace = false,
                 bool abort_process = false) noexcept;
 

modules/base/catch_throw_test.cpp

@@ -114,7 +114,7 @@ TEST(CatchThrow, ThrowPrintStack)
 
     bool has_catch = CatchThrow([&]{
         throw 10;
-    }, true);
+    }, "ThrowPrintStack", true);
 
     EXPECT_TRUE(has_catch);
 

modules/eventx/thread_pool.cpp

@@ -360,7 +360,7 @@ void ThreadPool::threadProc(ThreadToken thread_token)
 
             {
                 RECORD_SCOPE();
-                CatchThrow(item->backend_task, true);
+                CatchThrow(item->backend_task, "tbox::eventx::ThreadPool", true);
             }
 
             auto exec_time_cost = Clock::now() - exec_time_point;

modules/eventx/work_thread.cpp

@@ -236,7 +236,7 @@ void WorkThread::threadProc()
 
             {
                 RECORD_SCOPE();
-                CatchThrow(item->backend_task, true);
+                CatchThrow(item->backend_task, "tbox::eventx::WorkThread", true);
             }
 
             auto exec_time_cost = Clock::now() - exec_time_point;

modules/jsonrpc/protos/header_stream_proto.cpp

@@ -83,7 +83,7 @@ ssize_t HeaderStreamProto::onRecvData(const void *data_ptr, size_t data_size)
             LogTrace("%s recv: %s", log_label_.c_str(), json_text.c_str());
 
         Json js;
-        bool is_throw = tbox::CatchThrow([&] { js = Json::parse(json_text); });
+        bool is_throw = tbox::CatchThrow([&] { js = Json::parse(json_text); }, "tbox::jsonrpc::HeaderStreamProto");
         if (is_throw) {
             LogNotice("parse json fail");
             return -1;