v0.9.5

Author: lkpworkspace

.gitignore

@@ -5,7 +5,9 @@
 
 bin/
 
-build/
+build*
+
+output*
 
 *.user
 
@@ -17,5 +19,3 @@ myframe/export.h
 myframe/config.h
 3rd/pkg/
 3rd/src/
-3rd/build/
-output/

3rd/CMakeLists.txt

@@ -23,6 +23,7 @@ ExternalProject_Add(
         -DBUILD_SHARED_LIBS=ON
         -DCMAKE_BUILD_TYPE=Release
         -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 )
 
 ExternalProject_Add(
@@ -42,6 +43,7 @@ ExternalProject_Add(
         -DWITH_GTEST=OFF
         -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
         -DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 )
 ExternalProject_Add_StepDependencies(glog install gflags)
 
@@ -64,4 +66,5 @@ ExternalProject_Add(
         -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
         -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
         -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 )

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 if (POLICY CMP0091)
   cmake_policy(SET CMP0091 NEW)
 endif()
-project(myframe VERSION 0.9.4)
+project(myframe VERSION 0.9.5)
 
 ### option
 option(MYFRAME_USE_CV "Using conditional variables for thread communication" ON)

cpplint.bash

@@ -19,6 +19,9 @@ function main() {
     -name "*.cxx" -or \
     -name "*.cuh" \
     ')' -and -not -path "./build/*" \
+    -and -not -path "./output/*" \
+    -and -not -path "./3rd/*" \
+    -and -not -path "./myframe/export.h" \
     | xargs python3 ./cpplint.py
 }
 

examples/CMakeLists.txt

@@ -34,26 +34,29 @@ add_library(example_trans_obj SHARED example_trans_obj.cpp)
 target_link_libraries(example_trans_obj ${PROJECT_NAME})
 
 ### install
-FILE(GLOB conf_files "*.json")
-INSTALL(FILES 
+file(GLOB conf_files "*.json")
+# 在unix like系统下禁用MYFRAME_USE_CV才能用,有需要再打开
+list(REMOVE_ITEM conf_files "${CMAKE_CURRENT_SOURCE_DIR}/example_worker_interactive_with_3rd_frame.json")
+install(FILES
   ${conf_files}
   PERMISSIONS
   OWNER_READ OWNER_WRITE
   GROUP_READ
   WORLD_READ
   DESTINATION ${MYFRAME_SERVICE_DIR}
 )
-INSTALL(TARGETS 
+install(TARGETS
   example_actor_helloworld
   example_actor_timer
   example_actor_serial
   example_actor_concurrent
   example_actor_subscribe
   example_node
-  example_worker_actor_interactive 
+  example_worker_actor_interactive
   example_worker_publish
-  example_worker_talk 
-  example_worker_interactive_with_3rd_frame
+  example_worker_talk
+  # 在unix like系统下禁用MYFRAME_USE_CV才能用,有需要再打开
+  # example_worker_interactive_with_3rd_frame
   example_worker_quit
   example_config
   example_trans_obj

examples/example_config.cpp

@@ -17,6 +17,10 @@ class ExampleActorConfig : public myframe::Actor {
   int Init(const char* param) override {
     (void)param;
     auto conf = GetConfig();
+    LOG(INFO) << GetActorName() << " pending queue size "
+      << GetMailbox()->GetPendingQueueSize();
+    LOG(INFO) << GetActorName() << " run queue size "
+      << GetMailbox()->GetRunQueueSize();
     LOG(INFO) << GetActorName() << " conf " << conf->toStyledString();
     return 0;
   }

examples/example_config.json

@@ -6,6 +6,8 @@
             {
                 "instance_name":"#1",
                 "instance_config":{
+                    "pending_queue_size":-1,
+                    "run_queue_size":-1,
                     "key1":"hello",
                     "key2":"world"
                 }

launcher/conf/sys.json

@@ -1,4 +1,6 @@
 {
+    "default_pending_queue_size":-1,
+    "default_run_queue_size":-1,
     "thread_poll_size":4,
     "conn_event_size":2,
     "warning_msg_size":10

launcher/launcher.cpp

@@ -77,7 +77,9 @@ int main(int argc, char** argv) {
     lib_dir.string(),
     module_args.GetThreadPoolSize(),
     module_args.GetConnEventSize(),
-    module_args.GetWarningMsgSize())) {
+    module_args.GetWarningMsgSize(),
+    module_args.GetDefaultPendingQueueSize(),
+    module_args.GetDefaultRunQueueSize())) {
     LOG(ERROR) << "Init failed";
     return -1;
   }

launcher/module_argument.cpp

@@ -131,6 +131,14 @@ bool ModuleArgument::ParseSysConf(const std::string& sys_conf) {
       && root["service_dir"].isString()) {
     conf_dir_ = root["service_dir"].asString();
   }
+  if (root.isMember("default_pending_queue_size")
+      && root["default_pending_queue_size"].isInt()) {
+    default_pending_queue_size_ = root["default_pending_queue_size"].asInt();
+  }
+  if (root.isMember("default_run_queue_size")
+      && root["default_run_queue_size"].isInt()) {
+    default_run_queue_size_ = root["default_run_queue_size"].asInt();
+  }
   return true;
 }