[perf] optimize manager set function.

[doc] add tips for python version

Author: ChunelFeng

python/tutorial/T04-Complex.py

@@ -19,9 +19,8 @@ def tutorial_complex():
 
     d1, d2, d3 = MyNode1('nodeD1'), MyNode1('nodeD2'), MyNode1('nodeD3')
     d4 = MyNode2({d1}, 'nodeD4', 1)
-    d23_cluster = GCluster()
-    d23_cluster.addGElements([d2, d3])
-    d23_cluster.addDependGElements({d1})
+    d23_cluster = GCluster([d2, d3])    # 表示 d23_cluster 中包含 [d2,d3] 两个element
+    d23_cluster.addDependGElements({d1})    # 表示 d23_cluster 依赖 {d1} 一个element，注意 [] 和 {} 的不用用法
     d_region = GRegion([d1, d23_cluster, d4])
 
     a, c, e = MyNode1(), MyNode1(), MyNode1()

src/GraphCtrl/GraphElement/GElementManager.cpp

@@ -23,7 +23,6 @@ GElementManager::~GElementManager() {
 CStatus GElementManager::init() {
     CGRAPH_FUNCTION_BEGIN
 
-    /** 首先判定，注册的element全部不为空 */
     for (auto element : manager_elements_) {
         CGRAPH_ASSERT_NOT_NULL(element)
     }

src/GraphCtrl/GraphElement/GGroup/GGroup.cpp

@@ -48,11 +48,19 @@ CStatus GGroup::addElement(GElementPtr element) {
 
     this->group_elements_arr_.emplace_back(element);
     element->belong_ = this;
+    // 在这里不要进行判断返回值，因为可能是region刚刚创建的时候，还没被写入 pipeline中
     element->addManagers(param_manager_, event_manager_, stage_manager_);
+
+    status = addElementEx(element);
     CGRAPH_FUNCTION_END
 }
 
 
+CStatus GGroup::addElementEx(GElementPtr element) {
+    CGRAPH_EMPTY_FUNCTION
+}
+
+
 CVoid GGroup::dumpGroupLabelBegin(std::ostream& oss) {
     oss << "subgraph ";
     oss << "cluster_p" << this;    // cluster_ 是 graphviz的关键字，和CGraph中GCluster逻辑无关
@@ -95,12 +103,12 @@ CStatus GGroup::addManagers(GParamManagerPtr paramManager,
                             GEventManagerPtr eventManager,
                             GStageManagerPtr stageManager) {
     CGRAPH_FUNCTION_BEGIN
-    CGRAPH_ASSERT_NOT_NULL(paramManager, eventManager)
+    CGRAPH_ASSERT_NOT_NULL(paramManager, eventManager, stageManager)
     CGRAPH_ASSERT_INIT(false)
 
-    this->setGParamManager(paramManager);
-    this->setGEventManager(eventManager);
-    this->setGStageManager(stageManager);
+    status = GElement::addManagers(paramManager, eventManager, stageManager);
+    CGRAPH_FUNCTION_CHECK_STATUS
+
     for (GElementPtr element : group_elements_arr_) {
         CGRAPH_ASSERT_NOT_NULL(element)
         status += element->addManagers(paramManager, eventManager, stageManager);

src/GraphCtrl/GraphElement/GGroup/GGroup.h

@@ -29,7 +29,14 @@ class GGroup : public GElement {
      * @param element
      * @return
      */
-    virtual CStatus addElement(GElementPtr element);
+    CStatus addElement(GElementPtr element);
+
+    /**
+     * 在添加element的时候，附加选项
+     * @param element
+     * @return
+     */
+    virtual CStatus addElementEx(GElementPtr element);
 
     CStatus addManagers(GParamManagerPtr paramManager,
                         GEventManagerPtr eventManager,

src/GraphCtrl/GraphElement/GGroup/GRegion/GRegion.cpp

@@ -59,12 +59,11 @@ CStatus GRegion::run() {
 }
 
 
-CStatus GRegion::addElement(GElementPtr element) {
+CStatus GRegion::addElementEx(GElementPtr element) {
     CGRAPH_FUNCTION_BEGIN
     CGRAPH_ASSERT_NOT_NULL(element, manager_)
 
     manager_->manager_elements_.emplace(element);
-    status = GGroup::addElement(element);
     CGRAPH_FUNCTION_END
 }
 
@@ -105,25 +104,6 @@ CBool GRegion::isSerializable() const {
 }
 
 
-CStatus GRegion::addManagers(GParamManagerPtr paramManager,
-                             GEventManagerPtr eventManager,
-                             GStageManagerPtr stageManager) {
-    CGRAPH_FUNCTION_BEGIN
-    CGRAPH_ASSERT_INIT(false)
-    CGRAPH_ASSERT_NOT_NULL(paramManager, eventManager, stageManager)
-
-    this->setGParamManager(paramManager);
-    this->setGEventManager(eventManager);
-    this->setGStageManager(stageManager);
-    for (auto* cur : manager_->manager_elements_) {
-        CGRAPH_ASSERT_NOT_NULL(cur)
-        status += cur->addManagers(paramManager, eventManager, stageManager);
-    }
-
-    CGRAPH_FUNCTION_END
-}
-
-
 CBool GRegion::isSeparate(GElementCPtr a, GElementCPtr b) const {
     return GSeparateOptimizer::checkSeparate(manager_->manager_elements_, a, b);
 }

src/GraphCtrl/GraphElement/GGroup/GRegion/GRegion.h

@@ -38,16 +38,12 @@ class GRegion : public GGroup {
     CStatus run() final;
     CStatus destroy() final;
 
-    CStatus addElement(GElementPtr element) final;
-
 private:
     CVoid dump(std::ostream& oss) final;
 
     CBool isSerializable() const final;
 
-    CStatus addManagers(GParamManagerPtr paramManager,
-                        GEventManagerPtr eventManager,
-                        GStageManagerPtr stageManager) final;
+    CStatus addElementEx(GElementPtr element) final;
 
     CBool isSeparate(GElementCPtr a, GElementCPtr b) const final;
 

src/GraphCtrl/GraphElement/GGroup/GSome/GSome.h

@@ -22,8 +22,6 @@ class GSome : public GGroup {
 protected:
     explicit GSome();
 
-    CStatus addElement(GElementPtr element) final;
-
     CStatus run() final;
 
     CBool isSerializable() const final;
@@ -36,6 +34,9 @@ class GSome : public GGroup {
 
     CGRAPH_NO_ALLOWED_COPY(GSome)
 
+private:
+    CStatus addElementEx(GElementPtr element) final;
+
 private:
     CInt left_num_ = 0;                        // 还剩的触发结束的个数
     CStatus cur_status_ ;                      // 记录异步时刻的当前状态信息

src/GraphCtrl/GraphElement/GGroup/GSome/GSome.inl

@@ -21,7 +21,7 @@ GSome<TriggerNum>::GSome() {
 
 
 template<CInt TriggerNum>
-CStatus GSome<TriggerNum>::addElement(GElementPtr element) {
+CStatus GSome<TriggerNum>::addElementEx(GElementPtr element) {
     CGRAPH_FUNCTION_BEGIN
     CGRAPH_ASSERT_INIT(false)
     CGRAPH_ASSERT_NOT_NULL(element)
@@ -34,7 +34,6 @@ CStatus GSome<TriggerNum>::addElement(GElementPtr element) {
         element->setTimeout(CGRAPH_MAX_BLOCK_TTL, GElementTimeoutStrategy::HOLD_BY_PIPELINE);
     }
 
-    group_elements_arr_.emplace_back(element);
     CGRAPH_FUNCTION_END
 }