[perf] optimize include method

ChunelFeng · Jul 19, 2023 · 2e0c9ae · 2e0c9ae
1 parent 57984f7
commit 2e0c9ae
Show file tree

Hide file tree

Showing 37 changed files with 39 additions and 45 deletions.
diff --git a/CGraph-test.sh → CGraph-run-tutorials.sh b/CGraph-test.sh → CGraph-run-tutorials.sh
diff --git a/cmake/CGraph-env-include.cmake b/cmake/CGraph-env-include.cmake
@@ -27,8 +27,11 @@ ELSEIF(WIN32)
         add_compile_options(/wd4267)
         add_compile_options(/wd4018)
     ENDIF()
+    # 本工程也支持在windows平台上的mingw环境使用
 ENDIF()
 
+include_directories(${CGRAPH_PROJECT_ROOT_DIR}/src/)    # 直接加入"CGraph.h"文件对应的位置
+
 # 以下三选一，本地编译执行，推荐OBJECT方式
 add_library(CGraph OBJECT ${CGRAPH_PROJECT_SRC_LIST})      # 通过代码编译
 # add_library(CGraph SHARED ${CGRAPH_PROJECT_SRC_LIST})    # 编译libCGraph动态库

diff --git a/src/CBasic/CStruct.h b/src/CBasic/CStruct.h
@@ -10,8 +10,6 @@
 #define CGRAPH_CSTRUCT_H
 
 #include "CBasicDefine.h"
-#include "CStatus.h"
-#include "CFuncType.h"
 
 CGRAPH_NAMESPACE_BEGIN
 
@@ -20,13 +18,6 @@ CGRAPH_NAMESPACE_BEGIN
  * 仅针对类似 bean 数据类型的定义
  */
 class CStruct {
-    /**
-     * 初始化所有字段的值信息
-     * @return
-     */
-     virtual CStatus setup() {
-         CGRAPH_EMPTY_FUNCTION
-     }
 };
 
 CGRAPH_NAMESPACE_END

diff --git a/src/CBasic/CValType.h b/src/CBasic/CValType.h
@@ -27,7 +27,7 @@ using CBool = CGraph::CBOOL;
 using CIndex = CGraph::CINT;            // 表示标识信息，可以为负数
 using CFloat = CGraph::CFLOAT;
 using CDouble = CGraph::CDOUBLE;
-using CConStr = CGraph::CCONSTR;    // 表示 const char*
+using CConStr = CGraph::CCONSTR;        // 表示 const char*
 using CBigBool = CGraph::CBIGBOOL;
 
 using CStatus = CGraph::CSTATUS;

diff --git a/src/GraphCtrl/GraphPipeline/GPipeline.cpp b/src/GraphCtrl/GraphPipeline/GPipeline.cpp
@@ -229,7 +229,9 @@ CStatus GPipeline::makeSerial() {
 
     UThreadPoolConfig config;
     config.default_thread_size_ = 0;    // 设置之后，不再开辟线程池，直接通过主线程执行pipeline的逻辑
+    config.secondary_thread_size_ = 0;
     config.max_thread_size_ = 0;
+    config.monitor_enable_ = false;
     schedule_.config_ = config;
     CGRAPH_FUNCTION_END
 }

diff --git a/src/GraphCtrl/GraphPipeline/GPipeline.inl b/src/GraphCtrl/GraphPipeline/GPipeline.inl
@@ -173,8 +173,7 @@ GPipeline* GPipeline::addGDaemon(CMSec ms, TParam* param) {
     CGRAPH_ASSERT_NOT_NULL_THROW_ERROR(param_manager_, daemon_manager_)
 
     GDaemonPtr daemon = CGRAPH_SAFE_MALLOC_COBJECT(TDaemon)
-    daemon->setDParam<TParam>(param)
-            ->setInterval(ms);
+    daemon->setDParam<TParam>(param)->setInterval(ms);
     daemon->setGParamManager(this->param_manager_);
     daemon->setGEventManager(this->event_manager_);
     status = daemon_manager_->add(daemon);

diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolConfig.h b/src/UtilsCtrl/ThreadPool/UThreadPoolConfig.h
@@ -14,7 +14,7 @@
 
 CGRAPH_NAMESPACE_BEGIN
 
-struct UThreadPoolConfig : public UThreadObject {
+struct UThreadPoolConfig : public CStruct {
     /** 具体值含义，参考UThreadPoolDefine.h文件 */
     int default_thread_size_ = CGRAPH_DEFAULT_THREAD_SIZE;
     int secondary_thread_size_ = CGRAPH_SECONDARY_THREAD_SIZE;

diff --git a/tutorial/MyGAspect/MyConnAspect.h b/tutorial/MyGAspect/MyConnAspect.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYCONNASPECT_H
 #define CGRAPH_MYCONNASPECT_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyConnParam.h"
 
 class MyConnAspect : public CGraph::GAspect {

diff --git a/tutorial/MyGAspect/MyPipelineParamAspect.h b/tutorial/MyGAspect/MyPipelineParamAspect.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYPIPELINEPARAMASPECT_H
 #define CGRAPH_MYPIPELINEPARAMASPECT_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 class MyPipelineParamAspect : public CGraph::GAspect {

diff --git a/tutorial/MyGAspect/MyTemplateAspect.h b/tutorial/MyGAspect/MyTemplateAspect.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYTEMPLATEASPECT_H
 #define CGRAPH_MYTEMPLATEASPECT_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 template<class ...Args>
 class MyTemplateAspect : public CGraph::GTemplateAspect<Args...> {

diff --git a/tutorial/MyGAspect/MyTimerAspect.h b/tutorial/MyGAspect/MyTimerAspect.h
@@ -11,7 +11,7 @@
 
 #include <chrono>
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyTimerAspect : public CGraph::GAspect {
 public:

diff --git a/tutorial/MyGAspect/MyTraceAspect.h b/tutorial/MyGAspect/MyTraceAspect.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYTRACEASPECT_H
 #define CGRAPH_MYTRACEASPECT_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyTraceAspect : public CGraph::GAspect {
 public:

diff --git a/tutorial/MyGCondition/MyCondition.h b/tutorial/MyGCondition/MyCondition.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYCONDITION_H
 #define CGRAPH_MYCONDITION_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyCondition : public CGraph::GCondition {
 public:

diff --git a/tutorial/MyGCondition/MyParamCondition.h b/tutorial/MyGCondition/MyParamCondition.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYPARAMCONDITION_H
 #define CGRAPH_MYPARAMCONDITION_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 class MyParamCondition : public CGraph::GCondition {

diff --git a/tutorial/MyGDaemon/MyMonitorDaemon.h b/tutorial/MyGDaemon/MyMonitorDaemon.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYMONITORDAEMON_H
 #define CGRAPH_MYMONITORDAEMON_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyMonitorDaemon : public CGraph::GDaemon {
 public:

diff --git a/tutorial/MyGDaemon/MyParamDaemon.h b/tutorial/MyGDaemon/MyParamDaemon.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYPARAMDAEMON_H
 #define CGRAPH_MYPARAMDAEMON_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 #include "../MyParams/MyConnParam.h"
 

diff --git a/tutorial/MyGDaemon/MyTemplateDaemon.h b/tutorial/MyGDaemon/MyTemplateDaemon.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 template<class ...Args>
 class MyTemplateDaemon : public CGraph::GTemplateDaemon<Args...> {

diff --git a/tutorial/MyGEvent/MyPrintEvent.h b/tutorial/MyGEvent/MyPrintEvent.h
@@ -9,8 +9,7 @@
 #ifndef CGRAPH_MYPRINTEVENT_H
 #define CGRAPH_MYPRINTEVENT_H
 
-#include "../../src/CGraph.h"
-
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 class MyPrintEvent : public CGraph::GEvent {

diff --git a/tutorial/MyGNode/HelloCGraphNode.h b/tutorial/MyGNode/HelloCGraphNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_HELLOCGRAPHNODE_H
 #define CGRAPH_HELLOCGRAPHNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class HelloCGraphNode : public CGraph::GNode {
 public:

diff --git a/tutorial/MyGNode/MyEParamNode.h b/tutorial/MyGNode/MyEParamNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYEPARAMNODE_H
 #define CGRAPH_MYEPARAMNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyVersionParam.h"
 #include "../MyParams/MyConnParam.h"
 

diff --git a/tutorial/MyGNode/MyEventNode.h b/tutorial/MyGNode/MyEventNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYEVENTNODE_H
 #define CGRAPH_MYEVENTNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyEventNode : public CGraph::GNode {
 public:
@@ -21,7 +21,7 @@ class MyEventNode : public CGraph::GNode {
          * 从打印结果可以看出，after event send 这条信息，提前执行
          * 执行的时候，和pipeline公用同一个线程池资源
          */
-        notify("my-print-event", GEventType::ASYNC);
+        notify("my-print-event", GEventType::SYNC);
 
         CGraph::CGRAPH_ECHO("[%s], after event notify", this->getName().c_str());
         return status;

diff --git a/tutorial/MyGNode/MyHoldNode.h b/tutorial/MyGNode/MyHoldNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYHOLDNODE_H
 #define CGRAPH_MYHOLDNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 static const char* HOLD_PARAM_NAME = "hold-param";

diff --git a/tutorial/MyGNode/MyNode1.h b/tutorial/MyGNode/MyNode1.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYNODE1_H
 #define CGRAPH_MYNODE1_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyNode1 : public CGraph::GNode {
 public:

diff --git a/tutorial/MyGNode/MyNode2.h b/tutorial/MyGNode/MyNode2.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYNODE2_H
 #define CGRAPH_MYNODE2_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 class MyNode2 : public CGraph::GNode {
 public:

diff --git a/tutorial/MyGNode/MyPubMessageNode.h b/tutorial/MyGNode/MyPubMessageNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYPUBMESSAGENODE_H
 #define CGRAPH_MYPUBMESSAGENODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyMessageParam.h"
 
 class MyPubMessageNode : public CGraph::GNode {

diff --git a/tutorial/MyGNode/MyReadParamNode.h b/tutorial/MyGNode/MyReadParamNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYREADPARAMNODE_H
 #define CGRAPH_MYREADPARAMNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 class MyReadParamNode : public CGraph::GNode {

diff --git a/tutorial/MyGNode/MyRecvMessageNode.h b/tutorial/MyGNode/MyRecvMessageNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYRECVMESSAGENODE_H
 #define CGRAPH_MYRECVMESSAGENODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyMessageParam.h"
 
 class MyRecvMessageNode : public CGraph::GNode {

diff --git a/tutorial/MyGNode/MySendMessageNode.h b/tutorial/MyGNode/MySendMessageNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYSENDMESSAGENODE_H
 #define CGRAPH_MYSENDMESSAGENODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyMessageParam.h"
 
 class MySendMessageNode : public CGraph::GNode {

diff --git a/tutorial/MyGNode/MyShowAddressNode.h b/tutorial/MyGNode/MyShowAddressNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYSHOWADDRESSNODE_H
 #define CGRAPH_MYSHOWADDRESSNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 class MyShowAddressNode : public CGraph::GNode {

diff --git a/tutorial/MyGNode/MySubMessageNode.h b/tutorial/MyGNode/MySubMessageNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYSUBMESSAGENODE_H
 #define CGRAPH_MYSUBMESSAGENODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyMessageParam.h"
 
 template <typename ...Args>

diff --git a/tutorial/MyGNode/MyTemplateNode.h b/tutorial/MyGNode/MyTemplateNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYTEMPLATENODE_H
 #define CGRAPH_MYTEMPLATENODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 template <typename ...Args>
 class MyTemplateNode : public CGraph::GTemplateNode<Args ...> {

diff --git a/tutorial/MyGNode/MyWriteParamNode.h b/tutorial/MyGNode/MyWriteParamNode.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYWRITEPARAMNODE_H
 #define CGRAPH_MYWRITEPARAMNODE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 #include "../MyParams/MyParam.h"
 
 class MyWriteParamNode : public CGraph::GNode {

diff --git a/tutorial/MyParams/MyConnParam.h b/tutorial/MyParams/MyConnParam.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYCONNPARAM_H
 #define CGRAPH_MYCONNPARAM_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 const static char* CONN_PARAM_KEY = "conn";
 

diff --git a/tutorial/MyParams/MyMessageParam.h b/tutorial/MyParams/MyMessageParam.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYMESSAGEPARAM_H
 #define CGRAPH_MYMESSAGEPARAM_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 struct MyMessageParam : public CGraph::GMessageParam {
     int num = 0;

diff --git a/tutorial/MyParams/MyParam.h b/tutorial/MyParams/MyParam.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYPARAM_H
 #define CGRAPH_MYPARAM_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 /**
  * MyParam 是GParam的具体实现类

diff --git a/tutorial/MyParams/MyVersionParam.h b/tutorial/MyParams/MyVersionParam.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYVERSIONPARAM_H
 #define CGRAPH_MYVERSIONPARAM_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 const static char* VERSION_PARAM_KEY = "version";
 

diff --git a/tutorial/MyUtils/MyDistance.h b/tutorial/MyUtils/MyDistance.h
@@ -9,7 +9,7 @@
 #ifndef CGRAPH_MYDISTANCE_H
 #define CGRAPH_MYDISTANCE_H
 
-#include "../../src/CGraph.h"
+#include "CGraph.h"
 
 template<typename TSrc, typename TRes>    // 自定义距离类型
 class MyDistance : public CGraph::UDistance<TSrc, TRes> {