Commit 8d2be813 authored by Oystein Eftevaag's avatar Oystein Eftevaag Committed by Commit Bot

Manual roll of third_party/perfetto with a buildfix

Roll src/third_party/perfetto/ e0f20f188..ae0c5273b (6 commits)

https://android.googlesource.com/platform/external/perfetto.git/+log/e0f20f1882cb..ae0c5273bfa1

$ git log e0f20f188..ae0c5273b --date=short --no-merges --format='%ad %ae %s'
2018-07-26 michaschwab Time Axis
2018-07-26 michaschwab Pan and Zoom
2018-07-26 hjd perfetto-ui: Make ControllerProxy a global
2018-07-26 primiano Non-functional refactorings of ftrace controller/sink/metadata
2018-07-26 dproy Rename pieces of track and inline TrackShell
2018-07-25 primiano Wait for producers to ACK the stop when disabling the trace.

Created with:
  roll-dep src/third_party/perfetto

TBR=primiano@chromium.org

Change-Id: I19070966bfcc21bbe65905f23f3418938bb5209e
Reviewed-on: https://chromium-review.googlesource.com/1152177Reviewed-by: default avataroysteine <oysteine@chromium.org>
Commit-Queue: oysteine <oysteine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578487}
parent 8b6e95be
...@@ -912,7 +912,7 @@ deps = { ...@@ -912,7 +912,7 @@ deps = {
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + 'e0f20f1882cb7b47877ebda0d5dceb2174441745', Var('android_git') + '/platform/external/perfetto.git' + '@' + 'ae0c5273bfa1532b5badf6f47d1ea58596c06c0d',
'src/third_party/perl': { 'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + 'ac0d98b5cee6c024b0cffeb4f8f45b6fc5ccdb78', 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + 'ac0d98b5cee6c024b0cffeb4f8f45b6fc5ccdb78',
......
...@@ -211,6 +211,10 @@ void ProducerClient::NotifyFlushComplete(perfetto::FlushRequestID) { ...@@ -211,6 +211,10 @@ void ProducerClient::NotifyFlushComplete(perfetto::FlushRequestID) {
NOTREACHED(); NOTREACHED();
} }
void ProducerClient::NotifyDataSourceStopped(perfetto::DataSourceInstanceID) {
NOTREACHED();
}
std::unique_ptr<perfetto::TraceWriter> ProducerClient::CreateTraceWriter( std::unique_ptr<perfetto::TraceWriter> ProducerClient::CreateTraceWriter(
perfetto::BufferID target_buffer) { perfetto::BufferID target_buffer) {
DCHECK(shared_memory_arbiter_); DCHECK(shared_memory_arbiter_);
......
...@@ -88,6 +88,7 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient ...@@ -88,6 +88,7 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient
void UnregisterDataSource(const std::string& name) override; void UnregisterDataSource(const std::string& name) override;
size_t shared_buffer_page_size_kb() const override; size_t shared_buffer_page_size_kb() const override;
void NotifyFlushComplete(perfetto::FlushRequestID) override; void NotifyFlushComplete(perfetto::FlushRequestID) override;
void NotifyDataSourceStopped(perfetto::DataSourceInstanceID) override;
static void ResetTaskRunnerForTesting(); static void ResetTaskRunnerForTesting();
......
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