Commit 561c9646 authored by Eric Seckler's avatar Eric Seckler Committed by Commit Bot

Roll src/third_party/perfetto 7b49412a6e09..327406e12cba (6 commits)

Also introduces new required methods on ProducerClient to make the roll succeed.

https://android.googlesource.com/platform/external/perfetto.git/+log/7b49412a6e09..327406e12cba


git log 7b49412a6e09..327406e12cba --date=short --no-merges --format='%ad %ae %s'
2018-11-30 primiano@google.com Merge "ftrace: add PagePool for ftrace reader"
2018-11-29 treehugger-gerrit@google.com Merge "Flush on SIGINT to perfetto cmd."
2018-11-29 lalitm@google.com Merge "trace_processor: initial implementation of the args table"
2018-11-29 fmayer@google.com Merge "profiling: Add missing error return to script."
2018-11-29 eseckler@google.com Merge "perfetto: Add an IPC to associate trace writers with buffers"
2018-11-29 fmayer@google.com Merge "profiling: Better profiling script."

Change-Id: I5708cfcc3067b0e948eb4803c0963088cb3eddcc
Reviewed-on: https://chromium-review.googlesource.com/c/1356779Reviewed-by: default avatarPrimiano Tucci <primiano@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612642}
parent fe7e5f14
...@@ -1008,7 +1008,7 @@ deps = { ...@@ -1008,7 +1008,7 @@ deps = {
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '7b49412a6e09da8fe1d37dca67db94c12a509ffc', Var('android_git') + '/platform/external/perfetto.git' + '@' + '327406e12cbace001312895b565ed0c33bf24186',
'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',
......
...@@ -302,4 +302,13 @@ std::unique_ptr<perfetto::TraceWriter> ProducerClient::CreateTraceWriter( ...@@ -302,4 +302,13 @@ std::unique_ptr<perfetto::TraceWriter> ProducerClient::CreateTraceWriter(
return shared_memory_arbiter_->CreateTraceWriter(target_buffer); return shared_memory_arbiter_->CreateTraceWriter(target_buffer);
} }
void ProducerClient::RegisterTraceWriter(uint32_t writer_id,
uint32_t target_buffer) {
// TODO(eseckler): implement.
}
void ProducerClient::UnregisterTraceWriter(uint32_t writer_id) {
// TODO(eseckler): implement.
}
} // namespace tracing } // namespace tracing
...@@ -117,6 +117,8 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient ...@@ -117,6 +117,8 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient
perfetto::BufferID target_buffer) override; perfetto::BufferID target_buffer) override;
void NotifyFlushComplete(perfetto::FlushRequestID) override; void NotifyFlushComplete(perfetto::FlushRequestID) override;
perfetto::SharedMemory* shared_memory() const override; perfetto::SharedMemory* shared_memory() const override;
void RegisterTraceWriter(uint32_t writer_id, uint32_t target_buffer) override;
void UnregisterTraceWriter(uint32_t writer_id) override;
// These ProducerEndpoint functions are only used on the service // These ProducerEndpoint functions are only used on the service
// side and should not be called on the clients. // side and should not be called on the clients.
......
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