commit e81101e37c915b01e53785829b238bb4819078b2
author Dan Field <dnfield@google.com> Wed Jun 05 21:55:11 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Jun 05 21:55:11 2019 +0000
tree 8c4b1ebc3cea8db19b32f4717db29423eb6bfc48
parent b079445295f7d28e9b7e73665da5c64827cfbfe4

[vm, fuchsia] Allow for enabling trace categories through both traceutil and the service protocol.

This is needed so that we can make progress on using flutter drive tests on Fuchsia.

Change-Id: Ifea0e4747c0cf28b85ad5a2eff20bdf361a10be3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/104948
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Reviewed-by: Zach Anderson <zra@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>

runtime/vm/timeline.h

diff --git a/runtime/vm/timeline.h b/runtime/vm/timeline.h
index 3fa4cff..9d43824 100644
--- a/runtime/vm/timeline.h
+++ b/runtime/vm/timeline.h
@@ -60,10 +60,14 @@
 
   bool enabled() {
 #if defined(HOST_OS_FUCHSIA) && !defined(FUCHSIA_SDK)
+#ifdef PRODUCT
     return trace_is_category_enabled(fuchsia_name_);
 #else
+    return trace_is_category_enabled(fuchsia_name_) || enabled_ != 0;
+#endif  // PRODUCT
+#else
     return enabled_ != 0;
-#endif
+#endif  // defined(HOST_OS_FUCHSIA) && !defined(FUCHSIA_SDK)
   }
 
   void set_enabled(bool enabled) { enabled_ = enabled ? 1 : 0; }