v0.9.9

.clang-format

@@ -2,7 +2,7 @@
 Language:        Cpp
 # BasedOnStyle:  Google
 AccessModifierOffset: -1
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: DontAlign
 AlignConsecutiveMacros: false
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
@@ -23,7 +23,7 @@ AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
-BinPackParameters: true
+BinPackParameters: false
 BraceWrapping:
   AfterCaseLabel:  false
   AfterClass:      false

.github/workflows/macos.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Setup Dependencies
         run: |
-          brew install ninja
+          brew install ninja cmake
 
       - name: Cache jsoncpp
         id: cache-jsoncpp
@@ -72,6 +72,7 @@ jobs:
         if: steps.cache-gflags.outputs.cache-hit != 'true'
         run: |
           cmake -S gflags-2.2.2 -B build-gflags \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
             -DBUILD_SHARED_LIBS=ON \
             -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
             -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/gflags \
@@ -96,6 +97,7 @@ jobs:
         if: steps.cache-glog.outputs.cache-hit != 'true'
         run: |
           cmake -S glog-0.6.0 -B build-glog \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
             -DBUILD_SHARED_LIBS=ON \
             -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
             -DWITH_PKGCONFIG=OFF \
@@ -108,6 +110,7 @@ jobs:
       - name: Configure
         run: |
           cmake -S . -B build_${{matrix.build_type}} \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
             -DCMAKE_CXX_EXTENSIONS=OFF \
             -DCMAKE_CXX_STANDARD=${{matrix.std}} \
             -DCMAKE_CXX_STANDARD_REQUIRED=ON \

CMakeLists.txt

@@ -3,7 +3,7 @@ if (POLICY CMP0091)
   cmake_policy(SET CMP0091 NEW)
 endif()
 project(myframe
-  VERSION 0.9.8
+  VERSION 0.9.9
   LANGUAGES CXX
 )
 
@@ -13,6 +13,7 @@ option(MYFRAME_GENERATE_EXAMPLE "Generate example library" ON)
 option(MYFRAME_GENERATE_TEST "Generate test executable program" ON)
 option(MYFRAME_INSTALL_TEMPLATE "Install template project" ON)
 option(MYFRAME_INSTALL_LAUNCHER "Install launcher program" ON)
+option(MYFRAME_ENABLE_ASAN "Enable ASAN" OFF)
 
 ### cmake module
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

examples/CMakeLists.txt

@@ -13,6 +13,14 @@ if (jsoncpp_lib_type STREQUAL "STATIC_LIBRARY")
     JsonCpp::JsonCpp
   )
 endif ()
+if (MYFRAME_ENABLE_ASAN)
+  add_compile_options(
+    "$<$<CXX_COMPILER_ID:GNU,Clang>:-fsanitize=address>"
+  )
+  add_link_options(
+    "$<$<CXX_COMPILER_ID:GNU,Clang>:-fsanitize=address>"
+  )
+endif ()
 
 ### actor
 add_library(example_actor_helloworld SHARED example_actor_helloworld.cpp)

examples/example_actor_concurrent.cpp

@@ -22,8 +22,7 @@ class ExampleActorConcurrent : public myframe::Actor {
     return distrib(engine);
   }
 
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     return 0;
   }
 
@@ -42,8 +41,7 @@ class ExampleActorConcurrent : public myframe::Actor {
 
 class ExampleActorConcurrentTrigger : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     state_ = {
         {"actor.ExampleActorConcurrent.1", false},
         {"actor.ExampleActorConcurrent.2", false},

examples/example_actor_concurrent.json

@@ -4,22 +4,18 @@
     "actor":{
         "ExampleActorConcurrentTrigger":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ],
         "ExampleActorConcurrent":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             },
             {
-                "instance_name":"2",
-                "instance_params":""
+                "instance_name":"2"
             },
             {
-                "instance_name":"3",
-                "instance_params":""
+                "instance_name":"3"
             }
         ]
     }

examples/example_actor_helloworld.cpp

@@ -15,8 +15,7 @@ Author: 李柯鹏 <[email protected]>
 class ExampleActorHelloWorld : public myframe::Actor {
  public:
   /* actor模块加载完毕后调用 */
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     auto mailbox = GetMailbox();
     /* 构造 hello,world 消息发送给自己 */
     mailbox->Send(mailbox->Addr(), std::string("hello,world"));

examples/example_actor_helloworld.json

@@ -4,8 +4,7 @@
     "actor":{
         "ExampleActorHelloWorld":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     }

examples/example_actor_serial.cpp

@@ -22,8 +22,7 @@ int random(int min, int max) {
 
 class ExampleActorSerial1 : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     auto mailbox = GetMailbox();
     mailbox->Send("actor.ExampleActorSerial1.1",
       std::make_shared<myframe::Msg>(""));
@@ -45,8 +44,7 @@ class ExampleActorSerial1 : public myframe::Actor {
 
 class ExampleActorSerial2 : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     return 0;
   }
 
@@ -65,8 +63,7 @@ class ExampleActorSerial2 : public myframe::Actor {
 
 class ExampleActorSerial3 : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     return 0;
   }
 

examples/example_actor_serial.json

@@ -4,20 +4,17 @@
     "actor":{
         "ExampleActorSerial1":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ],
         "ExampleActorSerial2":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ],
         "ExampleActorSerial3":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     }

examples/example_actor_subscribe.cpp

@@ -15,8 +15,7 @@ Author: 李柯鹏 <[email protected]>
 
 class ExampleActorPub : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     Timeout("1000ms", 100);
     return 0;
   }
@@ -41,8 +40,7 @@ class ExampleActorPub : public myframe::Actor {
 
 class ExampleActorSub : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     Subscribe("actor.ExampleActorPub.1");
     return 0;
   }

examples/example_actor_subscribe.json

@@ -4,14 +4,12 @@
     "actor":{
         "ExampleActorPub":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ],
         "ExampleActorSub":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     }

examples/example_actor_timer.cpp

@@ -11,8 +11,7 @@ Author: 李柯鹏 <[email protected]>
 
 class ExampleActorTimer : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     /* 设置超时时间为 100 * 10 ms */
     Timeout("1000ms", 10);
     return 0;

examples/example_actor_timer.json

@@ -4,8 +4,7 @@
     "actor":{
         "ExampleActorTimer":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     }

examples/example_config.cpp

@@ -14,8 +14,7 @@ Author: 李柯鹏 <[email protected]>
 
 class ExampleActorConfig : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     auto conf = GetConfig();
     LOG(INFO) << GetActorName() << " pending queue size "
       << GetMailbox()->GetPendingQueueSize();

examples/example_node.cpp

@@ -23,8 +23,7 @@ class ExampleNode : public myframe::Actor {
     // ...
   }
 
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     // 启动订阅监听程序
     //   收到消息调用OnSubMsg()回调函数将消息发送给framework的组件
 
@@ -106,8 +105,7 @@ class ExampleNode : public myframe::Actor {
 */
 class ExampleNodePub : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     Timeout("1000ms", 100);
     return 0;
   }
@@ -141,8 +139,7 @@ class ExampleNodePub : public myframe::Actor {
 */
 class ExampleNodeSub : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     Subscribe(g_topic, "TEXT", myframe::Msg::TransMode::kDDS);
     return 0;
   }

examples/example_thread_quit.cpp

@@ -24,8 +24,7 @@ class ExampleThreadQuit : public myframe::Actor {
     LOG(INFO) << "thread quit example quit";
   }
 
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     th_run_.store(true);
     th_ = std::thread([this](){
       while (th_run_.load()) {

examples/example_thread_quit.json

@@ -4,8 +4,7 @@
     "actor":{
         "ExampleThreadQuit":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     }

examples/example_trans_obj.cpp

@@ -30,8 +30,7 @@ class TransObj {
 
 class ExampleActorTransObj : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     return 0;
   }
 

examples/example_worker_actor_interactive.cpp

@@ -15,8 +15,7 @@ Author: 李柯鹏 <[email protected]>
 /// 回显worker发来的消息
 class ExampleActorInteractive : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     return 0;
   }
 

examples/example_worker_actor_interactive.json

@@ -4,8 +4,7 @@
     "actor":{
         "ExampleActorInteractive":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     },

examples/example_worker_interactive_with_3rd_frame.cpp

@@ -149,8 +149,7 @@ class ExampleWorkerInteractiveWith3rdFrame : public myframe::Worker {
 
 class ExampleActorInteractiveWith3rdFrame : public myframe::Actor {
  public:
-  int Init(const char* param) override {
-    (void)param;
+  int Init() override {
     Timeout("100ms", 10);
     return 0;
   }

examples/example_worker_interactive_with_3rd_frame.json

@@ -4,8 +4,7 @@
     "actor":{
         "ExampleActorInteractiveWith3rdFrame":[
             {
-                "instance_name":"1",
-                "instance_params":""
+                "instance_name":"1"
             }
         ]
     },

launcher/CMakeLists.txt

@@ -24,6 +24,17 @@ if (jsoncpp_lib_type STREQUAL "STATIC_LIBRARY")
   )
 endif ()
 
+if (MYFRAME_ENABLE_ASAN)
+  target_compile_options(${DIR_NAME}
+    PRIVATE
+    "$<$<CXX_COMPILER_ID:GNU,Clang>:-fsanitize=address>"
+  )
+  target_link_options(${DIR_NAME}
+    PRIVATE
+    "$<$<CXX_COMPILER_ID:GNU,Clang>:-fsanitize=address>"
+  )
+endif ()
+
 ### install
 install(TARGETS ${DIR_NAME}
   LIBRARY DESTINATION ${MYFRAME_LIB_DIR}