commit e8c13aa012c915c6a290d2a85950af67303e75f9
author Jason Simmons <jason-simmons@users.noreply.github.com> Tue Jun 09 10:58:05 2020 -0700
committer GitHub <noreply@github.com> Tue Jun 09 10:58:05 2020 -0700
tree 7aaa4ad5172325cfec3032cdf0fc8ec1449776e6
parent e356b0610d1ed8670afc88897009ee6a8acb6ecb

Disable event tracing templates in release mode (#18855)

fml/trace_event.cc

diff --git a/fml/trace_event.cc b/fml/trace_event.cc
index 56a8838..b9d0452 100644
--- a/fml/trace_event.cc
+++ b/fml/trace_event.cc
@@ -12,16 +12,10 @@
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
 
-#if (FLUTTER_RELEASE && !defined(OS_FUCHSIA))
-#define TIMELINE_ENABLED 0
-#else
-#define TIMELINE_ENABLED 1
-#endif
-
 namespace fml {
 namespace tracing {
 
-#if TIMELINE_ENABLED
+#if FLUTTER_TIMELINE_ENABLED
 
 namespace {
 AsciiTrie gWhitelist;
@@ -290,7 +284,7 @@
   );
 }
 
-#else  // TIMELINE_ENABLED
+#else  // FLUTTER_TIMELINE_ENABLED
 
 void TraceSetWhitelist(const std::vector<std::string>& whitelist) {}
 
@@ -379,7 +373,7 @@
 void TraceEventFlowEnd0(TraceArg category_group, TraceArg name, TraceIDArg id) {
 }
 
-#endif  // TIMELINE_ENABLED
+#endif  // FLUTTER_TIMELINE_ENABLED
 
 }  // namespace tracing
 }  // namespace fml

fml/trace_event.h

diff --git a/fml/trace_event.h b/fml/trace_event.h
index 225fa9e..54ca3b9 100644
--- a/fml/trace_event.h
+++ b/fml/trace_event.h
@@ -45,6 +45,12 @@
 #include "flutter/fml/time/time_point.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 
+#if (FLUTTER_RELEASE && !defined(OS_FUCHSIA))
+#define FLUTTER_TIMELINE_ENABLED 0
+#else
+#define FLUTTER_TIMELINE_ENABLED 1
+#endif
+
 #if !defined(OS_FUCHSIA)
 #ifndef TRACE_EVENT_HIDE_MACROS
 
@@ -193,9 +199,11 @@
                   TraceArg name,
                   TraceIDArg identifier,
                   Args... args) {
+#if FLUTTER_TIMELINE_ENABLED
   auto split = SplitArguments(args...);
   TraceTimelineEvent(category, name, identifier, Dart_Timeline_Event_Counter,
                      split.first, split.second);
+#endif  // FLUTTER_TIMELINE_ENABLED
 }
 
 // HACK: Used to NOP FML_TRACE_COUNTER macro without triggering unused var
@@ -208,9 +216,11 @@
 
 template <typename... Args>
 void TraceEvent(TraceArg category, TraceArg name, Args... args) {
+#if FLUTTER_TIMELINE_ENABLED
   auto split = SplitArguments(args...);
   TraceTimelineEvent(category, name, 0, Dart_Timeline_Event_Begin, split.first,
                      split.second);
+#endif  // FLUTTER_TIMELINE_ENABLED
 }
 
 void TraceEvent0(TraceArg category_group, TraceArg name);
@@ -235,6 +245,7 @@
                              TimePoint begin,
                              TimePoint end,
                              Args... args) {
+#if FLUTTER_TIMELINE_ENABLED
   auto identifier = TraceNonce();
   const auto split = SplitArguments(args...);
 
@@ -262,6 +273,7 @@
                      split.first,                    // names
                      split.second                    // values
   );
+#endif  // FLUTTER_TIMELINE_ENABLED
 }
 
 void TraceEventAsyncBegin0(TraceArg category_group,