[perf] optimize group function, no need to override addElement()

jimsdog · May 9, 2024 · 2c42a2b · 2c42a2b
1 parent e4d98fb
commit 2c42a2b
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 44 deletions.
diff --git a/src/GraphCtrl/GraphElement/GElement.cpp b/src/GraphCtrl/GraphElement/GElement.cpp
@@ -175,8 +175,7 @@ CStatus GElement::addDependGElements(const GElementPtrSet& elements) {
 
 
 CStatus GElement::addElementInfo(const GElementPtrSet& dependElements,
-                                 const std::string& name,
-                                 CSize loop) {
+                                 const std::string& name, CSize loop) {
     CGRAPH_FUNCTION_BEGIN
     CGRAPH_ASSERT_INIT_THROW_ERROR(false)
 

diff --git a/src/GraphCtrl/GraphElement/GElement.h b/src/GraphCtrl/GraphElement/GElement.h
@@ -231,13 +231,13 @@ class GElement : public GElementObject,
      * run方法执行之前的执行函数
      * @return
      */
-    virtual CVoid beforeRun();
+    CVoid beforeRun();
 
     /**
      * run方法执行之后的执行函数
      * @return
      */
-    virtual CVoid afterRun();
+    CVoid afterRun();
 
     /**
      * 判定node是否可以和前面节点一起执行
@@ -280,8 +280,7 @@ class GElement : public GElementObject,
      * @return
      */
     virtual CStatus addElementInfo(const std::set<GElement *>& dependElements,
-                                   const std::string& name,
-                                   CSize loop);
+                                   const std::string& name, CSize loop);
 
     /**
      * 设置manager信息
@@ -321,9 +320,7 @@ class GElement : public GElementObject,
      * @param label
      * @return
     */
-    CVoid dumpEdge(std::ostream& oss,
-                   GElement* src,
-                   GElement* dst,
+    CVoid dumpEdge(std::ostream& oss, GElement* src, GElement* dst,
                    const std::string& label = CGRAPH_EMPTY);
 
     /**

diff --git a/src/GraphCtrl/GraphElement/GGroup/GCluster/GCluster.cpp b/src/GraphCtrl/GraphElement/GGroup/GCluster/GCluster.cpp
@@ -27,16 +27,6 @@ CStatus GCluster::run() {
 }
 
 
-CStatus GCluster::addElement(GElementPtr element) {
-    CGRAPH_FUNCTION_BEGIN
-    CGRAPH_ASSERT_NOT_NULL(element)
-
-    this->group_elements_arr_.emplace_back(element);
-
-    CGRAPH_FUNCTION_END
-}
-
-
 CVoid GCluster::dump(std::ostream& oss) {
     dumpElement(oss);
     dumpGroupLabelBegin(oss);

diff --git a/src/GraphCtrl/GraphElement/GGroup/GCluster/GCluster.h b/src/GraphCtrl/GraphElement/GGroup/GCluster/GCluster.h
@@ -22,8 +22,6 @@ class GCluster : public GGroup {
 private:
     CStatus run() final;
 
-    CStatus addElement(GElementPtr element) final;
-
     CVoid dump(std::ostream& oss) final;
 
     CBool isSeparate(GElementCPtr a, GElementCPtr b) const final;

diff --git a/src/GraphCtrl/GraphElement/GGroup/GCondition/GCondition.cpp b/src/GraphCtrl/GraphElement/GGroup/GCondition/GCondition.cpp
@@ -16,15 +16,6 @@ GCondition::GCondition() {
 }
 
 
-CStatus GCondition::addElement(GElementPtr element) {
-    CGRAPH_FUNCTION_BEGIN
-    CGRAPH_ASSERT_NOT_NULL(element)
-
-    this->group_elements_arr_.emplace_back(element);
-    CGRAPH_FUNCTION_END
-}
-
-
 CStatus GCondition::run() {
     CGRAPH_FUNCTION_BEGIN
 

diff --git a/src/GraphCtrl/GraphElement/GGroup/GCondition/GCondition.h b/src/GraphCtrl/GraphElement/GGroup/GCondition/GCondition.h
@@ -36,8 +36,6 @@ class GCondition : public GGroup {
 
     CStatus run() override;
 
-    CStatus addElement(GElementPtr element) final;
-
     CBool isSeparate(GElementCPtr a, GElementCPtr b) const override;
 
     friend class GPipeline;

diff --git a/src/GraphCtrl/GraphElement/GGroup/GGroup.cpp b/src/GraphCtrl/GraphElement/GGroup/GGroup.cpp
@@ -42,6 +42,15 @@ CStatus GGroup::destroy() {
 }
 
 
+CStatus GGroup::addElement(GElementPtr element) {
+    CGRAPH_FUNCTION_BEGIN
+    CGRAPH_ASSERT_NOT_NULL(element)
+
+    this->group_elements_arr_.emplace_back(element);
+    CGRAPH_FUNCTION_END
+}
+
+
 CVoid GGroup::dumpGroupLabelBegin(std::ostream& oss) {
     oss << "subgraph ";
     oss << "cluster_p" << this;    // cluster_ 是 graphviz的关键字，和CGraph中GCluster逻辑无关

diff --git a/src/GraphCtrl/GraphElement/GGroup/GGroup.h b/src/GraphCtrl/GraphElement/GGroup/GGroup.h
@@ -24,7 +24,7 @@ class GGroup : public GElement {
      * @param element
      * @return
      */
-    virtual CStatus addElement(GElementPtr element) = 0;
+    virtual CStatus addElement(GElementPtr element);
 
     CBool isSerializable() const override;
 

diff --git a/src/GraphCtrl/GraphElement/GGroup/GMutable/GMutable.cpp b/src/GraphCtrl/GraphElement/GGroup/GMutable/GMutable.cpp
@@ -22,14 +22,6 @@ GMutable::~GMutable() {
 }
 
 
-CStatus GMutable::addElement(GElementPtr element) {
-    CGRAPH_FUNCTION_BEGIN
-    CGRAPH_ASSERT_NOT_NULL(element)
-    this->group_elements_arr_.emplace_back(element);
-    CGRAPH_FUNCTION_END
-}
-
-
 CStatus GMutable::init() {
     CGRAPH_FUNCTION_BEGIN
     CGRAPH_ASSERT_NOT_NULL(manager_)

diff --git a/src/GraphCtrl/GraphElement/GGroup/GMutable/GMutable.h b/src/GraphCtrl/GraphElement/GGroup/GMutable/GMutable.h
@@ -28,8 +28,6 @@ class GMutable : public GGroup {
     ~GMutable() override;
 
 private:
-    CStatus addElement(GElementPtr element) final;
-
     CStatus init() final;
 
     CStatus run() final;

diff --git a/src/GraphCtrl/GraphElement/GGroup/GSome/GSome.h b/src/GraphCtrl/GraphElement/GGroup/GSome/GSome.h
@@ -22,7 +22,7 @@ class GSome : public GGroup {
 protected:
     explicit GSome();
 
-    CStatus addElement(GElementPtr element) override;
+    CStatus addElement(GElementPtr element) final;
 
     CStatus run() final;