Made the perfetto backend implementation more inline:

project-chip · Dec 19, 2023 · 7522efe · 7522efe
1 parent cfb0e5f
commit 7522efe
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/src/protocols/secure_channel/CASESession.cpp b/src/protocols/secure_channel/CASESession.cpp
@@ -546,7 +546,7 @@ void CASESession::OnResponseTimeout(ExchangeContext * ec)
 {
     VerifyOrReturn(ec != nullptr, ChipLogError(SecureChannel, "CASESession::OnResponseTimeout was called by null exchange"));
     VerifyOrReturn(mExchangeCtxt == ec, ChipLogError(SecureChannel, "CASESession::OnResponseTimeout exchange doesn't match"));
-    MATTER_TRACE_COUNTER("casetimeout","CASE");
+    MATTER_TRACE_COUNTER("casetimeout", "CASESession");
     ChipLogError(SecureChannel, "CASESession timed out while waiting for a response from the peer. Current state was %u",
                  to_underlying(mState));
     // Discard the exchange so that Clear() doesn't try aborting it.  The
@@ -743,7 +743,7 @@ 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");
+    MATTER_TRACE_COUNTER("sigma1cnt", "CASESession");
 
     ReturnErrorOnFailure(HandleSigma1(std::move(msg)));
 
@@ -964,7 +964,7 @@ CHIP_ERROR CASESession::SendSigma2Resume()
 CHIP_ERROR CASESession::SendSigma2()
 {
     MATTER_TRACE_SCOPE("SendSigma2", "CASESession");
-    MATTER_TRACE_COUNTER("sigma2cnt","CASE");
+    MATTER_TRACE_COUNTER("sigma2cnt", "CASESession");
 
     VerifyOrReturnError(GetLocalSessionId().HasValue(), CHIP_ERROR_INCORRECT_STATE);
     VerifyOrReturnError(mFabricsTable != nullptr, CHIP_ERROR_INCORRECT_STATE);
@@ -1560,7 +1560,7 @@ CHIP_ERROR CASESession::SendSigma3c(SendSigma3Data & data, CHIP_ERROR status)
 CHIP_ERROR CASESession::HandleSigma3a(System::PacketBufferHandle && msg)
 {
     MATTER_TRACE_SCOPE("HandleSigma3", "CASESession");
-    MATTER_TRACE_COUNTER("sigma3cnt","CASE");
+    MATTER_TRACE_COUNTER("sigma3cnt", "CASESession");
     CHIP_ERROR err = CHIP_NO_ERROR;
     System::PacketBufferTLVReader tlvReader;
     TLV::TLVReader decryptedDataTlvReader;

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,7 +28,6 @@
 #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,7 +26,6 @@
 //    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>
@@ -68,6 +67,12 @@
         ::chip::Tracing::Internal::LogNodeDiscoveryFailed(_trace_data);                                                            \
     } while (false)
 
+#define MATTER_TRACE_COUNTER(label, group)                                                                                         \
+    do                                                                                                                             \
+    {                                                                                                                              \
+        ::chip::Tracing::Internal::Counter(label, group);                                                                          \
+    } while (false)
+
 #else // MATTER_TRACING_ENABLED
 
 #define _MATTER_TRACE_DISABLE(...)                                                                                                 \

diff --git a/src/tracing/multiplexed/include/matter/tracing/macros_impl.h b/src/tracing/multiplexed/include/matter/tracing/macros_impl.h
@@ -29,7 +29,6 @@
 #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,7 +31,3 @@
 #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/BUILD.gn b/src/tracing/perfetto/BUILD.gn
@@ -78,7 +78,6 @@ static_library("perfetto") {
   public_deps = [
     ":perfetto_tracing",
     "${chip_root}/src/lib/address_resolve",
-    "${chip_root}/src/tracing",
     "${chip_root}/src/transport",
     "${chip_root}/third_party/perfetto:sdk",
   ]

diff --git a/src/tracing/perfetto/include/matter/tracing/macros_impl.h b/src/tracing/perfetto/include/matter/tracing/macros_impl.h
@@ -23,12 +23,10 @@
 #endif
 
 #include <perfetto.h>
-#include <tracing/registry.h>
 
 PERFETTO_DEFINE_CATEGORIES(perfetto::Category("Matter").SetDescription("Matter trace events"));
 
 #define MATTER_TRACE_BEGIN(label, group) TRACE_EVENT_BEGIN("Matter", label, "class_name", group)
 #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) ::chip::Tracing::Internal::Counter(label, group)
diff --git a/src/tracing/perfetto/perfetto_tracing.cpp b/src/tracing/perfetto/perfetto_tracing.cpp
@@ -21,10 +21,10 @@
 #include <lib/address_resolve/TracingStructs.h>
 #include <lib/core/ErrorStr.h>
 #include <lib/support/StringBuilder.h>
-#include <transport/TracingStructs.h>
-
+#include <lib/support/logging/TextOnlyLogging.h>
 #include <matter/tracing/macros_impl.h>
 #include <perfetto.h>
+#include <transport/TracingStructs.h>
 
 namespace chip {
 namespace Tracing {
@@ -55,7 +55,7 @@ void PerfettoBackend::LogMessageReceived(MessageReceivedInfo & info)
 void PerfettoBackend::TraceCounter(const char * label, const char * group)
 {
     std::string counterId = std::string(label);
-
+    ChipLogProgress(SecureChannel, "In trace counter");
     if (counters.find(counterId) == counters.end())
     {
         counters[counterId] = 1;
@@ -65,14 +65,15 @@ void PerfettoBackend::TraceCounter(const char * label, const char * group)
         counters[counterId]++;
     }
 
-    TRACE_EVENT_INSTANT("Matter", "Counter",                           //
-                        "Label", label,                                //
-                        "count", static_cast<int>(counters[counterId]) //
+    TRACE_EVENT("Matter", "Counter",         //
+                "Label", label,              //
+                "count", counters[counterId] //
     );
 }
 
 void PerfettoBackend::LogMessageSend(MessageSendInfo & info)
 {
+    ChipLogProgress(SecureChannel, "In trace counter");
     const char * messageType = "UNKNOWN";
     switch (info.messageType)
     {

diff --git a/src/tracing/perfetto/perfetto_tracing.h b/src/tracing/perfetto/perfetto_tracing.h
@@ -49,7 +49,7 @@ class PerfettoBackend : public ::chip::Tracing::Backend
     void LogNodeDiscoveryFailed(NodeDiscoveryFailedInfo &) override;
 
 private:
-    std::unordered_map<std::string, std::atomic<int>> counters;
+    std::unordered_map<std::string, int> counters;
 };
 
 } // namespace Perfetto