diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/tracing | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/tracing')
-rw-r--r-- | chromium/v8/src/tracing/trace-categories.h | 7 | ||||
-rw-r--r-- | chromium/v8/src/tracing/tracing-category-observer.cc | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/chromium/v8/src/tracing/trace-categories.h b/chromium/v8/src/tracing/trace-categories.h index 91bf3da96e7..2f9d672801f 100644 --- a/chromium/v8/src/tracing/trace-categories.h +++ b/chromium/v8/src/tracing/trace-categories.h @@ -32,6 +32,7 @@ PERFETTO_DEFINE_CATEGORIES( perfetto::Category("v8.console"), perfetto::Category("v8.execute"), perfetto::Category("v8.runtime"), + perfetto::Category("v8.wasm"), perfetto::Category::Group("devtools.timeline,v8"), perfetto::Category::Group("devtools.timeline," TRACE_DISABLED_BY_DEFAULT("v8.gc")), @@ -39,7 +40,6 @@ PERFETTO_DEFINE_CATEGORIES( perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.compile")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profiler")), - perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.cpu_profiler.hires")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.gc")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.gc_stats")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.ic_stats")), @@ -47,10 +47,11 @@ PERFETTO_DEFINE_CATEGORIES( perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.runtime_stats")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.runtime_stats_sampling")), perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.turbofan")), - perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.wasm")), + perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed")), + perfetto::Category(TRACE_DISABLED_BY_DEFAULT("v8.zone_stats")), perfetto::Category::Group("v8,devtools.timeline"), perfetto::Category::Group(TRACE_DISABLED_BY_DEFAULT("v8.turbofan") "," - TRACE_DISABLED_BY_DEFAULT("v8.wasm"))); + TRACE_DISABLED_BY_DEFAULT("v8.wasm.detailed"))); // clang-format on #endif // defined(V8_USE_PERFETTO) diff --git a/chromium/v8/src/tracing/tracing-category-observer.cc b/chromium/v8/src/tracing/tracing-category-observer.cc index a44074d52d1..3debacb548d 100644 --- a/chromium/v8/src/tracing/tracing-category-observer.cc +++ b/chromium/v8/src/tracing/tracing-category-observer.cc @@ -57,6 +57,13 @@ void TracingCategoryObserver::OnTraceEnabled() { i::TracingFlags::ic_stats.fetch_or(ENABLED_BY_TRACING, std::memory_order_relaxed); } + + TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("v8.zone_stats"), + &enabled); + if (enabled) { + i::TracingFlags::zone_stats.fetch_or(ENABLED_BY_TRACING, + std::memory_order_relaxed); + } } void TracingCategoryObserver::OnTraceDisabled() { |