[perf] add adaptor perf show type. simplify dump code

ChunelFeng · Sep 9, 2023 · d8f6e1f · d8f6e1f
1 parent 56339c3
commit d8f6e1f
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 18 deletions.
diff --git a/src/GraphCtrl/GraphDefine.h b/src/GraphCtrl/GraphDefine.h
@@ -26,6 +26,7 @@ static const char* CGRAPH_STR_DAEMON = "daemon";
 static const char* CGRAPH_STR_ASPECT = "aspect";
 static const char* CGRAPH_STR_EVENT = "event";
 static const char* CGRAPH_STR_FENCE = "fence";
+static const char* CGRAPH_STR_COORDINATOR = "coordinator";
 
 CGRAPH_NAMESPACE_END
 

diff --git a/src/GraphCtrl/GraphElement/GAdapter/GCoordinator/GCoordinator.h b/src/GraphCtrl/GraphElement/GAdapter/GCoordinator/GCoordinator.h
@@ -16,20 +16,22 @@ CGRAPH_NAMESPACE_BEGIN
 template<CInt SIZE>
 class GCoordinator : public GAdapter {
 protected:
-    CStatus run() final {
-        CGRAPH_FUNCTION_BEGIN
-        CGRAPH_ASSERT_NOT_NULL(thread_pool_)
-        status = (SIZE >= 0)
-                ? thread_pool_->createSecondaryThread(SIZE)
-                : thread_pool_->releaseSecondaryThread((-1) * SIZE);
-
-        CGRAPH_FUNCTION_END
-    }
+    explicit GCoordinator();
+
+    CStatus run() final;
+
+    CVoid dumpElement(std::ostream& oss) final;
+
+    CStatus checkSuitable() final;
+
+    friend class GPipeline;
 };
 
 template<CInt SIZE>
 using GCoordinatorPtr = GCoordinator<SIZE> *;
 
 CGRAPH_NAMESPACE_END
 
+#include "GCoordinator.inl"
+
 #endif //CGRAPH_GCOORDINATOR_H
diff --git a/src/GraphCtrl/GraphElement/GAdapter/GCoordinator/GCoordinator.inl b/src/GraphCtrl/GraphElement/GAdapter/GCoordinator/GCoordinator.inl
@@ -0,0 +1,54 @@
+/***************************
+@Author: Chunel
+@Contact: [email protected]
+@File: GCoordinator.inl
+@Time: 2023/9/8 21:12
+@Desc:
+***************************/
+
+#ifndef CGRAPH_GCOORDINATOR_INL
+#define CGRAPH_GCOORDINATOR_INL
+
+#include "GCoordinator.h"
+
+CGRAPH_NAMESPACE_BEGIN
+
+template<CInt SIZE>
+GCoordinator<SIZE>::GCoordinator() {
+    element_type_ = GElementType::COORDINATOR;
+    session_ = URandom<>::generateSession(CGRAPH_STR_COORDINATOR);
+}
+
+
+template<CInt SIZE>
+CStatus GCoordinator<SIZE>::run() {
+    CGRAPH_FUNCTION_BEGIN
+    CGRAPH_ASSERT_NOT_NULL(thread_pool_)
+    status = (SIZE >= 0)
+             ? thread_pool_->createSecondaryThread(SIZE)
+             : thread_pool_->releaseSecondaryThread((-1) * SIZE);
+
+    CGRAPH_FUNCTION_END
+}
+
+
+template<CInt SIZE>
+CVoid GCoordinator<SIZE>::dumpElement(std::ostream& oss) {
+    dumpElementHeader(oss);
+    dumpPerfInfo(oss);
+    oss << "\", shape=diamond]\n";
+}
+
+
+template<CInt SIZE>
+CStatus GCoordinator<SIZE>::checkSuitable() {
+    CGRAPH_FUNCTION_BEGIN
+    CGRAPH_RETURN_ERROR_STATUS_BY_CONDITION(loop_ > 1,    \
+    "cannot set GCoordinator loop > 1")
+
+    CGRAPH_FUNCTION_END
+}
+
+CGRAPH_NAMESPACE_END
+
+#endif //CGRAPH_GCOORDINATOR_INL
diff --git a/src/GraphCtrl/GraphElement/GAdapter/GFence/GFence.cpp b/src/GraphCtrl/GraphElement/GAdapter/GFence/GFence.cpp
@@ -54,6 +54,13 @@ CStatus GFence::checkSuitable() {
 }
 
 
+CVoid GFence::dumpElement(std::ostream& oss) {
+    dumpElementHeader(oss);
+    dumpPerfInfo(oss);
+    oss << "\", shape=box]\n";
+}
+
+
 CStatus GFence::run() {
     CGRAPH_FUNCTION_BEGIN
 

diff --git a/src/GraphCtrl/GraphElement/GAdapter/GFence/GFence.h b/src/GraphCtrl/GraphElement/GAdapter/GFence/GFence.h
@@ -41,7 +41,9 @@ class GFence : public GAdapter {
 protected:
     explicit GFence();
 
-    CStatus checkSuitable() override;
+    CStatus checkSuitable() final;
+
+    CVoid dumpElement(std::ostream& oss) final;
 
     CGRAPH_DECLARE_GPARAM_MANAGER_WRAPPER
 

diff --git a/src/GraphCtrl/GraphElement/GElement.cpp b/src/GraphCtrl/GraphElement/GElement.cpp
@@ -306,13 +306,7 @@ CVoid GElement::dumpEdge(std::ostream& oss, GElementPtr src, GElementPtr dst, co
 
 
 CVoid GElement::dumpElement(std::ostream& oss) {
-    oss << 'p' << this << "[label=\"";
-    if (this->name_.empty()) {
-        oss << 'p' << this;    // 如果没有名字，则通过当前指针位置来代替
-    } else {
-        oss << this->name_;
-    }
-
+    dumpElementHeader(oss);
     dumpPerfInfo(oss);
 
     oss << "\"];\n";
@@ -322,6 +316,16 @@ CVoid GElement::dumpElement(std::ostream& oss) {
 }
 
 
+CVoid GElement::dumpElementHeader(std::ostream& oss) {
+    oss << 'p' << this << "[label=\"";
+    if (this->name_.empty()) {
+        oss << 'p' << this;    // 如果没有名字，则通过当前指针位置来代替
+    } else {
+        oss << this->name_;
+    }
+}
+
+
 CVoid GElement::dumpPerfInfo(std::ostream& oss) {
     if (perf_info_ && perf_info_->loop_ > 0) {
         // 包含 perf信息的情况

diff --git a/src/GraphCtrl/GraphElement/GElement.h b/src/GraphCtrl/GraphElement/GElement.h
@@ -285,7 +285,14 @@ class GElement : public GElementObject,
      * graphviz dump 点逻辑
      * @param oss
     */
-    CVoid dumpElement(std::ostream& oss);
+    virtual CVoid dumpElement(std::ostream& oss);
+
+    /**
+     * dump 当前element的header。主要就是为了代码
+     * @param oss
+     * @return
+     */
+    CVoid dumpElementHeader(std::ostream& oss);
 
     /**
      * graphviz dump perf逻辑

diff --git a/src/GraphCtrl/GraphElement/GElementDefine.h b/src/GraphCtrl/GraphElement/GElementDefine.h
@@ -31,6 +31,7 @@ enum class GElementType {
     FUNCTION = 0x00040001,                   // 函数
     SINGLETON = 0x00040002,                  // 单例
     FENCE = 0x00040004,                      // 栅栏
+    COORDINATOR = 0x00040008,                // 协调
 };
 
 

diff --git a/src/GraphCtrl/GraphPipeline/GPipeline.cpp b/src/GraphCtrl/GraphPipeline/GPipeline.cpp
@@ -6,6 +6,8 @@
 @Desc: 
 ***************************/
 
+#include <iomanip>
+
 #include "GPipeline.h"
 
 CGRAPH_NAMESPACE_BEGIN
@@ -154,6 +156,8 @@ CStatus GPipeline::resume() {
 CStatus GPipeline::dump(std::ostream& oss) {
     CGRAPH_FUNCTION_BEGIN
     CGRAPH_ASSERT_NOT_NULL(element_manager_)
+    oss << std::fixed << std::setprecision(2);    // 小数点最多展示2位数字
+
     oss << "\ndigraph CGraph {\n";
     oss << "compound=true;\n";