Commit b3bd6f98 authored by Sami Kyostila's avatar Sami Kyostila Committed by Commit Bot

tracing: Update to latest TrackEventDescriptor message and roll Perfetto

git log f440b92c2422..02808dc0a181 --date=short --first-parent --format='%ad %ae %s'
2020-02-12 treehugger-gerrit@google.com Merge "TrackEvent: Add configuration for TrackEvent"
2020-02-12 fmayer@google.com Merge "Roll trace_to_text to pick up aosp/1232924"
2020-02-12 skyostil@google.com Merge "TrackEvent: Implement dynamic categories"

Created with:
  gclient setdep -r src/third_party/perfetto@02808dc0a181

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/perfetto-chromium-autoroll
Please CC perfetto-bugs@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

Bug: None
Tbr: perfetto-bugs@google.com
Change-Id: Ia7577abef7435e6ef8a37ac3a42b94363c44c986
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2054248
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Auto-Submit: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: default avatarStephen Nusko <nuskos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741071}
parent ec4b4a56
...@@ -1237,7 +1237,7 @@ deps = { ...@@ -1237,7 +1237,7 @@ deps = {
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + 'f440b92c242275b60151e5a5bf6ea444a1dafdc1', Var('android_git') + '/platform/external/perfetto.git' + '@' + '02808dc0a1816c535edf3e9acc16312e374985ab',
'src/third_party/perl': { 'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
...@@ -121,7 +121,11 @@ void PosixSystemProducer::NewDataSourceAdded( ...@@ -121,7 +121,11 @@ void PosixSystemProducer::NewDataSourceAdded(
std::set<std::string> category_set; std::set<std::string> category_set;
tracing::TracedProcessImpl::GetInstance()->GetCategories(&category_set); tracing::TracedProcessImpl::GetInstance()->GetCategories(&category_set);
for (const std::string& s : category_set) { for (const std::string& s : category_set) {
proto.add_available_categories(s.c_str()); auto* cat = proto.add_available_categories();
cat->set_name(s);
if (s.find(TRACE_DISABLED_BY_DEFAULT("")) == 0) {
cat->add_tags("slow");
}
} }
auto raw_proto = buffer.StitchSlices(); auto raw_proto = buffer.StitchSlices();
......
...@@ -117,7 +117,11 @@ void ProducerClient::NewDataSourceAdded( ...@@ -117,7 +117,11 @@ void ProducerClient::NewDataSourceAdded(
std::set<std::string> category_set; std::set<std::string> category_set;
tracing::TracedProcessImpl::GetInstance()->GetCategories(&category_set); tracing::TracedProcessImpl::GetInstance()->GetCategories(&category_set);
for (const std::string& s : category_set) { for (const std::string& s : category_set) {
proto.add_available_categories(s.c_str()); auto* cat = proto.add_available_categories();
cat->set_name(s);
if (s.find(TRACE_DISABLED_BY_DEFAULT("")) == 0) {
cat->add_tags("slow");
}
} }
auto raw_proto = buffer.StitchSlices(); auto raw_proto = buffer.StitchSlices();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment