feat(main):1.13.4, 支持--args参数

Author: hevake

modules/main/CMakeLists.txt

@@ -41,7 +41,7 @@ set(TBOX_MAIN_SOURCES
     error_signals.cpp
     terminate.cpp
     misc.cpp
-    args.cpp
+    args_parser.cpp
     module.cpp
     log.cpp
     trace.cpp)

modules/main/Makefile

@@ -36,7 +36,7 @@ CPP_SRC_FILES = \
 	error_signals.cpp \
 	terminate.cpp \
 	misc.cpp \
-	args.cpp \
+	args_parser.cpp \
 	module.cpp \
 	log.cpp \
 	trace.cpp \

modules/main/args.cpp modules/main/args_parser.cppmodules/main/args.cpp renamed to modules/main/args_parser.cpp

@@ -17,7 +17,7 @@
  * project authors may be found in the CONTRIBUTORS.md file in the root
  * of the source tree.
  */
-#include "args.h"
+#include "args_parser.h"
 
 #include <iostream>
 #include <fstream>
@@ -38,11 +38,12 @@ string GetAppDescribe();
 string GetAppBuildTime();
 void GetAppVersion(int &major, int &minor, int &rev, int &build);
 
-Args::Args(Json &conf) :
-    conf_(conf)
+ArgsParser::ArgsParser(Json &conf, Args &args)
+    : conf_(conf)
+    , args_(args)
 { }
 
-bool Args::parse(int argc, const char * const * const argv)
+bool ArgsParser::parse(int argc, const char * const * const argv)
 {
     bool run = true;    //!< 是否需要正常运行
     bool print_help = false;    //!< 是否需要打印帮助
@@ -97,7 +98,20 @@ bool Args::parse(int argc, const char * const * const argv)
         }
     );
 
-    parser.parse(argc, argv);
+    //! 将 --args 后面的参数全部复制到 args_ 中去
+    int args_pos = 0;
+    for (int i = 1; i < argc; ++i) {
+        const char* str = argv[i];
+        if (args_pos != 0) {
+            args_.push_back(str);
+        } else if (::strcmp(str, "--args") == 0) {
+            args_pos = i;
+            args_.push_back(proc_name);
+        }
+    }
+
+    auto tbox_argc = (args_pos != 0) ? args_pos : argc;
+    parser.parse(tbox_argc, argv);
 
     if (print_tips)
         printTips(proc_name);
@@ -114,12 +128,12 @@ bool Args::parse(int argc, const char * const * const argv)
     return run;
 }
 
-void Args::printTips(const std::string &proc_name)
+void ArgsParser::printTips(const std::string &proc_name)
 {
     cout << "Try '" << proc_name << " --help' for more information." << endl;
 }
 
-void Args::printHelp(const std::string &proc_name)
+void ArgsParser::printHelp(const std::string &proc_name)
 {
     cout << "Usage: " << proc_name << " [OPTION]" << endl
         << GetAppDescribe() << endl << endl
@@ -142,7 +156,7 @@ void Args::printHelp(const std::string &proc_name)
         << endl;
 }
 
-void Args::printVersion()
+void ArgsParser::printVersion()
 {
     int major, minor, rev, build;
     GetTboxVersion(major, minor, rev);
@@ -154,7 +168,7 @@ void Args::printVersion()
 
 }
 
-bool Args::load(const std::string &config_filename)
+bool ArgsParser::load(const std::string &config_filename)
 {
     try {
         auto js_patch = util::json::LoadDeeply(config_filename);
@@ -195,7 +209,7 @@ Json& BuildJsonByKey(const std::string &key, Json &js_root)
     return *p_node;
 }
 
-bool Args::set(const std::string &set_string)
+bool ArgsParser::set(const std::string &set_string)
 {
     vector<string> str_vec;
     if (util::string::Split(set_string, "=", str_vec) != 2) {

modules/main/args.h modules/main/args_parser.hmodules/main/args.h renamed to modules/main/args_parser.h

@@ -18,9 +18,9 @@
  * of the source tree.
  */
 /**
- * 本文件定义 Args 类
+ * 本文件定义 ArgsParser 类
  *
- * Args 类用于解释程序的命令参数，输出程序运行的配置Json数据。
+ * ArgsParser 类用于解释程序的命令参数，输出程序运行的配置Json数据。
  *
  * 参数：
  *
@@ -41,17 +41,18 @@
  * myproc -v
  * myproc --version
  */
-#ifndef TBOX_MAIN_ARGS_H_20211229
-#define TBOX_MAIN_ARGS_H_20211229
+#ifndef TBOX_MAIN_ARGS_PARSER_H_20211229
+#define TBOX_MAIN_ARGS_PARSER_H_20211229
 
 #include <tbox/base/json_fwd.h>
+#include "context.h"
 
 namespace tbox {
 namespace main {
 
-class Args {
+class ArgsParser {
   public:
-    Args(Json &conf);
+    ArgsParser(Json &conf, Args &args);
 
     /**
      * 解析参数
@@ -74,9 +75,10 @@ class Args {
 
   private:
     Json &conf_;
+    Args &args_;
 };
 
 }
 }
 
-#endif //TBOX_MAIN_ARGS_H_20211229
+#endif //TBOX_MAIN_ARGS_PARSER_H_20211229

modules/main/context.h

@@ -32,6 +32,8 @@
 namespace tbox {
 namespace main {
 
+using Args = std::vector<std::string>;
+
 //! 进程上下文
 class Context {
   public:
@@ -44,6 +46,8 @@ class Context {
 
     virtual std::chrono::milliseconds running_time() const = 0;
     virtual std::chrono::system_clock::time_point start_time_point() const = 0;
+
+    virtual const Args& args() const = 0;
 };
 
 }

modules/main/context_imp.cpp

@@ -111,11 +111,12 @@ void ContextImp::fillDefaultConfig(Json &cfg) const
     cfg["thread_pool"] = R"({"min":0, "max":1})"_json;
 }
 
-bool ContextImp::initialize(const char* proc_name, const Json &cfg, Module *module)
+bool ContextImp::initialize(const char* proc_name, const Json &cfg, const Args &args, Module *module)
 {
     TBOX_ASSERT(module != nullptr);
     module_ = module;
     js_conf_ = &cfg;
+    wp_args_ = &args;
 
     if (util::json::HasObjectField(cfg, "loop")) {
         auto &js_loop = cfg["loop"];
@@ -484,9 +485,9 @@ void ContextImp::initShell()
         }
     }
 
+    auto dump_node = wp_nodes->createDirNode("dump directory");
+    wp_nodes->mountNode(wp_nodes->rootNode(), dump_node, "dump");
     {
-        auto dump_node = wp_nodes->createDirNode("dump directory");
-        wp_nodes->mountNode(wp_nodes->rootNode(), dump_node, "dump");
         auto func_node = wp_nodes->createFuncNode(
             [this] (const Session &s, const Args &a) {
                 Json js;
@@ -506,6 +507,21 @@ void ContextImp::initShell()
         wp_nodes->mountNode(dump_node, func_node, "apps");
         wp_nodes->mountNode(dump_node, func_node, "conf");
     }
+    {
+        auto func_node = wp_nodes->createFuncNode(
+            [this] (const Session &s, const Args &) {
+                std::ostringstream oss;
+                auto &args = *wp_args_;
+                for (size_t i = 0; i < args.size(); ++i)
+                    oss << '[' << i << "]:" << args.at(i) << "\r\n";
+                oss << "\r\n";
+                s.send(oss.str());
+            },
+            "Dump args"
+        );
+
+        wp_nodes->mountNode(dump_node, func_node, "args");
+    }
 }
 
 }

modules/main/context_imp.h

@@ -40,7 +40,7 @@ class ContextImp : public Context {
 
     void fillDefaultConfig(Json &cfg) const;
 
-    bool initialize(const char *proc_name, const Json &cfg, Module *module);
+    bool initialize(const char *proc_name, const Json &cfg, const Args &args, Module *module);
     bool start();
     void stop();
     void cleanup();
@@ -56,6 +56,8 @@ class ContextImp : public Context {
     virtual std::chrono::milliseconds running_time() const override;
     virtual std::chrono::system_clock::time_point start_time_point() const override;
 
+    virtual const Args& args() const override { return *wp_args_; }
+
   protected:
     bool initLoop(const Json &js);
     bool initThreadPool(const Json &js);
@@ -81,6 +83,7 @@ class ContextImp : public Context {
 
     const Module *module_ = nullptr;
     const Json *js_conf_ = nullptr;
+    const Args *wp_args_ = nullptr;
 };
 
 }

modules/main/run_in_backend.cpp

@@ -32,7 +32,7 @@
 
 #include "module.h"
 #include "context_imp.h"
-#include "args.h"
+#include "args_parser.h"
 #include "log.h"
 #include "trace.h"
 
@@ -58,6 +58,7 @@ struct Runtime {
     ContextImp ctx;
     Module apps;
     Json js_conf;
+    Args args;
 
     util::PidFile pid_file;
     int exit_wait_sec = 1;
@@ -127,8 +128,9 @@ bool Start(int argc, char **argv)
     auto &ctx = _runtime->ctx;
     auto &apps = _runtime->apps;
     auto &js_conf = _runtime->js_conf;
+    auto &args = _runtime->args;
 
-    Args args(js_conf);
+    ArgsParser args_parser(js_conf, args);
     Trace trace;
 
     log.fillDefaultConfig(js_conf);
@@ -138,7 +140,7 @@ bool Start(int argc, char **argv)
     FillAppDefaultConfig(js_conf);
     apps.fillDefaultConfig(js_conf);
 
-    if (!args.parse(argc, argv))
+    if (!args_parser.parse(argc, argv))
         return false;
 
     std::string pid_filename;
@@ -171,7 +173,7 @@ bool Start(int argc, char **argv)
             std::this_thread::sleep_for(std::chrono::seconds(1));
     };
 
-    if (ctx.initialize(argv[0], js_conf, &apps)) {
+    if (ctx.initialize(argv[0], js_conf, args, &apps)) {
         if (apps.initialize(js_conf)) {
             if (ctx.start()) {  //! 启动所有应用
                 if (apps.start()) {

modules/main/run_in_frontend.cpp

@@ -32,7 +32,7 @@
 
 #include "module.h"
 #include "context_imp.h"
-#include "args.h"
+#include "args_parser.h"
 #include "log.h"
 #include "trace.h"
 
@@ -110,8 +110,10 @@ int Main(int argc, char **argv)
     Module apps("", ctx);
     RegisterApps(apps, ctx);
 
+    Args args;
     Json js_conf;
-    Args args(js_conf);
+    ArgsParser args_parser(js_conf, args);
+
     Trace trace;
 
     log.fillDefaultConfig(js_conf);
@@ -121,7 +123,7 @@ int Main(int argc, char **argv)
     FillAppDefaultConfig(js_conf);
     apps.fillDefaultConfig(js_conf);
 
-    if (!args.parse(argc, argv))
+    if (!args_parser.parse(argc, argv))
         return 0;
 
     std::string pid_filename;
@@ -158,7 +160,7 @@ int Main(int argc, char **argv)
             std::this_thread::sleep_for(std::chrono::seconds(1));
     };
 
-    if (ctx.initialize(argv[0], js_conf, &apps)) {
+    if (ctx.initialize(argv[0], js_conf, args, &apps)) {
         if (apps.initialize(js_conf)) {
             if (ctx.start() && apps.start()) {  //! 启动所有应用
                 RunInFrontend(ctx, apps, exit_wait_sec);

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 13
-TBOX_VERSION_REVISION := 3
+TBOX_VERSION_REVISION := 4