New Counter Implementation macro

shripad621git · Nov 21, 2023 · f0263e1 · f0263e1
1 parent a3c5d19
commit f0263e1
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 5 deletions.
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -263,6 +263,9 @@ endif()
 if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
   chip_gn_arg_bool("matter_enable_tracing_support"  "true")
   chip_gn_arg_append("matter_trace_config" "\"${CHIP_ROOT}/src/tracing/esp32_trace:esp32_trace_tracing\"")
+else()
+  chip_gn_arg_bool("matter_enable_tracing_support"  "true")
+  chip_gn_arg_append("matter_trace_config" "\"${CHIP_ROOT}/src/tracing/none\"")
 endif()
 
 if (CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
@@ -271,6 +274,8 @@ endif()
 
 if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
    target_include_directories(${COMPONENT_LIB} INTERFACE "${CHIP_ROOT}/src/tracing/esp32_trace/include")
+else()
+   target_include_directories(${COMPONENT_LIB} INTERFACE "${CHIP_ROOT}/src/tracing/none/include")
 endif()
 
 if (CONFIG_ENABLE_MATTER_EVENT_LIST)

diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp
@@ -742,6 +742,8 @@ CHIP_ERROR CASESession::SendSigma1()
 CHIP_ERROR CASESession::HandleSigma1_and_SendSigma2(System::PacketBufferHandle && msg)
 {
     MATTER_TRACE_SCOPE("HandleSigma1_and_SendSigma2", "CASESession");
+    MATTER_TRACE_COUNTER("sigma1cnt", "CASE");
+
     ReturnErrorOnFailure(HandleSigma1(std::move(msg)));
 
     return CHIP_NO_ERROR;

diff --git a/src/tracing/BUILD.gn b/src/tracing/BUILD.gn
@@ -53,8 +53,5 @@ source_set("macros") {
     ":tracing",
     ":tracing_buildconfig",
   ]
-
-  if (matter_enable_tracing_support) {
-    public_deps += [ matter_trace_config ]
-  }
+  public_deps += [ matter_trace_config ]
 }
diff --git a/src/tracing/backend.h b/src/tracing/backend.h
@@ -63,6 +63,7 @@ class Backend : public ::chip::IntrusiveListNodeBase<>
     /// Trace a zero-sized event
     virtual void TraceInstant(const char * label, const char * group) {}
 
+    virtual void TraceCounter(const char * label, const char * group) {}
     virtual void LogMessageSend(MessageSendInfo &) { TraceInstant("MessageSent", "Messaging"); }
     virtual void LogMessageReceived(MessageReceivedInfo &) { TraceInstant("MessageReceived", "Messaging"); }
 

diff --git a/src/tracing/esp32_trace/BUILD.gn b/src/tracing/esp32_trace/BUILD.gn
@@ -25,10 +25,16 @@ static_library("backend") {
   output_dir = "${root_out_dir}/lib"
 
   sources = [
+    "counter.cpp",
+    "counter.h",
     "esp32_tracing.cpp",
     "esp32_tracing.h",
   ]
-  public_deps = [ "${chip_root}/src/tracing" ]
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+    "${chip_root}/src/tracing",
+  ]
 }
 
 source_set("esp32_trace_tracing") {

diff --git a/src/tracing/esp32_trace/counter.cpp b/src/tracing/esp32_trace/counter.cpp
@@ -0,0 +1,30 @@
+#include "counter.h"
+
+namespace Insights{
+ESPInsightsCounter* ESPInsightsCounter::m_head = nullptr;
+
+ESPInsightsCounter* ESPInsightsCounter::GetInstance(const char* label, const char* group) {
+
+        ESPInsightsCounter* current = m_head;
+        ESPInsightsCounter* previous = nullptr;
+
+        while (current != nullptr) {
+            if (strcmp(current->label, label) == 0 && strcmp(current->group, group) == 0) {
+                current->instanceCount++;
+                return current;
+            }
+            previous = current;
+            current = current->m_next;
+        }
+
+        ESPInsightsCounter* newInstance = new ESPInsightsCounter(label, group);
+        newInstance->m_next = m_head;
+        m_head = newInstance;
+        return newInstance;
+}
+
+int ESPInsightsCounter::GetInstanceCount() const {
+    return instanceCount;
+}
+
+}
diff --git a/src/tracing/esp32_trace/counter.h b/src/tracing/esp32_trace/counter.h
@@ -0,0 +1,42 @@
+#include <esp_diagnostics_metrics.h>
+#include <iostream>
+#include <lib/support/CHIPCounter.h>
+#include <string.h>
+
+#define PATH1 "sys.cnt"
+namespace Insights {
+class ESPInsightsCounter
+{
+private:
+    static ESPInsightsCounter * m_head;
+    char label[50];
+    char group[50];
+    int instanceCount;
+    ESPInsightsCounter * m_next;
+    bool registered = false;
+
+    ESPInsightsCounter(const char * labelParam, const char * groupParam) : instanceCount(1), m_next(nullptr)
+    {
+        strncpy(label, labelParam, sizeof(label));
+        strncpy(group, groupParam, sizeof(group));
+    }
+
+public:
+    static ESPInsightsCounter * GetInstance(const char * label, const char * group);
+
+    int GetInstanceCount() const;
+
+    void ReportMetrics()
+    {
+        std::cout << "Trace instant: Label=" << label << ", Group=" << group << ", Instance Count=" << instanceCount << std::endl;
+        if (!registered)
+        {
+            esp_diag_metrics_register("SYS_CNT", label, label, PATH1, ESP_DIAG_DATA_TYPE_UINT);
+            registered = true;
+        }
+        std::cout << "Label ------" << label << "Count---" << instanceCount;
+        esp_diag_metrics_add_uint(label, instanceCount);
+    }
+};
+
+} // namespace Insights
diff --git a/src/tracing/esp32_trace/esp32_tracing.cpp b/src/tracing/esp32_trace/esp32_tracing.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "esp32_tracing.h"
+#include "counter.h"
 #include <esp_heap_caps.h>
 #include <esp_insights.h>
 #include <esp_log.h>
@@ -46,6 +47,10 @@ void ESP32Backend::LogNodeDiscovered(NodeDiscoveredInfo & info) {}
 
 void ESP32Backend::LogNodeDiscoveryFailed(NodeDiscoveryFailedInfo & info) {}
 
+void ESP32Backend::TraceCounter(const char * label, const char * group)
+{
+    ::Insights::ESPInsightsCounter::GetInstance(label, group)->ReportMetrics();
+}
 void ESP32Backend::TraceBegin(const char * label, const char * group)
 {
     LOG_HEAP_INFO(label, group, "Entry");

diff --git a/src/tracing/esp32_trace/esp32_tracing.h b/src/tracing/esp32_trace/esp32_tracing.h
@@ -21,6 +21,8 @@ class ESP32Backend : public ::chip::Tracing::Backend
     /// Trace a zero-sized event
     void TraceInstant(const char * label, const char * group) override;
 
+    void TraceCounter(const char * label, const char * group) override;
+
     void LogMessageSend(MessageSendInfo &) override;
     void LogMessageReceived(MessageReceivedInfo &) override;
 

diff --git a/src/tracing/esp32_trace/include/matter/tracing/macros_impl.h b/src/tracing/esp32_trace/include/matter/tracing/macros_impl.h
@@ -28,6 +28,7 @@
 #define MATTER_TRACE_BEGIN(label, group) ::chip::Tracing::Internal::Begin(label, group)
 #define MATTER_TRACE_END(label, group) ::chip::Tracing::Internal::End(label, group)
 #define MATTER_TRACE_INSTANT(label, group) ::chip::Tracing::Internal::Instant(label, group)
+#define MATTER_TRACE_COUNTER(label, group) ::chip::Tracing::Internal::Counter(label, group)
 
 namespace chip {
 namespace Tracing {

diff --git a/src/tracing/macros.h b/src/tracing/macros.h
@@ -26,6 +26,7 @@
 //    MATTER_TRACE_END(label, group)
 //    MATTER_TRACE_INSTANT(label, group)
 //    MATTER_TRACE_SCOPE(label, group)
+//    MATTER_TRACE_COUNTER(label, group)
 #include <matter/tracing/macros_impl.h>
 #include <tracing/log_declares.h>
 #include <tracing/registry.h>

diff --git a/src/tracing/multiplexed/include/matter/tracing/macros_impl.h b/src/tracing/multiplexed/include/matter/tracing/macros_impl.h
@@ -29,6 +29,7 @@
 #define MATTER_TRACE_END(label, group) ::chip::Tracing::Internal::End(label, group)
 #define MATTER_TRACE_INSTANT(label, group) ::chip::Tracing::Internal::Instant(label, group)
 
+#define MATTER_TRACE_COUNTER(label, group) ::chip::Tracing::Internal::Counter(label, group)
 namespace chip {
 namespace Tracing {
 

diff --git a/src/tracing/none/include/matter/tracing/macros_impl.h b/src/tracing/none/include/matter/tracing/macros_impl.h
@@ -31,3 +31,7 @@
 #define MATTER_TRACE_END(...) _MATTER_TRACE_DISABLE(__VA_ARGS__)
 #define MATTER_TRACE_INSTANT(...) _MATTER_TRACE_DISABLE(__VA_ARGS__)
 #define MATTER_TRACE_SCOPE(...) _MATTER_TRACE_DISABLE(__VA_ARGS__)
+#define MATTER_TRACE_COUNTER(label, group)                                                                                         \
+    do                                                                                                                             \
+    {                                                                                                                              \
+    } while (false)
diff --git a/src/tracing/perfetto/include/matter/tracing/macros_impl.h b/src/tracing/perfetto/include/matter/tracing/macros_impl.h
@@ -30,3 +30,7 @@ PERFETTO_DEFINE_CATEGORIES(perfetto::Category("Matter").SetDescription("Matter t
 #define MATTER_TRACE_END(label, group) TRACE_EVENT_END("Matter")
 #define MATTER_TRACE_INSTANT(label, group) TRACE_EVENT_INSTANT("Matter", label, "class_name", group)
 #define MATTER_TRACE_SCOPE(label, group) TRACE_EVENT("Matter", label, "class_name", group)
+#define MATTER_TRACE_COUNTER(label, group)                                                                                         \
+    do                                                                                                                             \
+    {                                                                                                                              \
+    } while (false)
diff --git a/src/tracing/perfetto/perfetto_tracing.cpp b/src/tracing/perfetto/perfetto_tracing.cpp
@@ -52,6 +52,7 @@ void PerfettoBackend::LogMessageReceived(MessageReceivedInfo & info)
     );
 }
 
+void PerfettoBackend::TraceCounter(const char * label, const char * group) {}
 void PerfettoBackend::LogMessageSend(MessageSendInfo & info)
 {
     const char * messageType = "UNKNOWN";

diff --git a/src/tracing/perfetto/perfetto_tracing.h b/src/tracing/perfetto/perfetto_tracing.h
@@ -38,6 +38,7 @@ class PerfettoBackend : public ::chip::Tracing::Backend
     // as they would be slower than expected. Perfetto trace macros
     // are expected to be set exclusively (via matter_trace_config)
 
+    void TraceCounter(const char * label, const char * group) override;
     void LogMessageSend(MessageSendInfo &) override;
     void LogMessageReceived(MessageReceivedInfo &) override;
 

diff --git a/src/tracing/registry.cpp b/src/tracing/registry.cpp
@@ -76,6 +76,14 @@ void Instant(const char * label, const char * group)
     }
 }
 
+void Counter(const char * label, const char * group)
+{
+    for (auto & backend : gTracingBackends)
+    {
+        backend.TraceCounter(label, group);
+    }
+}
+
 void LogMessageSend(::chip::Tracing::MessageSendInfo & info)
 {
     for (auto & backend : gTracingBackends)

diff --git a/src/tracing/registry.h b/src/tracing/registry.h
@@ -76,6 +76,7 @@ namespace Internal {
 void Begin(const char * label, const char * group);
 void End(const char * label, const char * group);
 void Instant(const char * label, const char * group);
+void Counter(const char * label, const char * group);
 
 void LogMessageSend(::chip::Tracing::MessageSendInfo & info);
 void LogMessageReceived(::chip::Tracing::MessageReceivedInfo & info);