Manually roll src/third_party/perfetto 349930ee9cd3..30f6fc14e50c (3 commits)

Also includes a manual modifications to MojoSharedMemory and
ProducerEndpoint subclasses to match upstream interface changes.

https://android.googlesource.com/platform/external/perfetto.git/+log/349930ee9cd3..30f6fc14e50c

git log 349930ee9cd3..30f6fc14e50c --date=short --first-parent --format='%ad %ae %s'
2020-02-04 treehugger-gerrit@google.com Merge "Forward malloc_iterate to dispatch table."
2020-02-04 taylori@google.com Merge "perfetto-ui: Edit track selection with checkboxes"
2020-02-04 treehugger-gerrit@google.com Merge "service: Support producer-provided SMBs service-side"

Created with:
  gclient setdep -r src/third_party/perfetto@30f6fc14e50c

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
Change-Id: I9890f226c7a59eb236661729d0a347153c5964bd
Tbr: perfetto-bugs@google.com
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036008
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738286}

DEPS

@@ -1262,7 +1262,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + '349930ee9cd34406a3f58c9bde403d9e330ae298',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + '30f6fc14e50c3f649083da068a4fd4df1f7e5aee',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',

services/tracing/public/cpp/perfetto/dummy_producer.cc

@@ -52,6 +52,8 @@ void DummyProducer::NotifyDataSourceStopped(perfetto::DataSourceInstanceID) {}
 
 void DummyProducer::ActivateTriggers(const std::vector<std::string>&) {}
 
+bool DummyProducer::IsShmemProvidedByProducer() const { return false; }
+
 // tracing::PerfettoProducer functions.
 void DummyProducer::NewDataSourceAdded(
     const PerfettoTracedProcess::DataSourceBase* const data_source) {}

services/tracing/public/cpp/perfetto/dummy_producer.h

@@ -45,6 +45,7 @@ class COMPONENT_EXPORT(TRACING_CPP) DummyProducer : public SystemProducer {
   void NotifyDataSourceStarted(perfetto::DataSourceInstanceID) override;
   void NotifyDataSourceStopped(perfetto::DataSourceInstanceID) override;
   void ActivateTriggers(const std::vector<std::string>&) override;
+  bool IsShmemProvidedByProducer() const override;
 
   // tracing::PerfettoProducer functions.
   void NewDataSourceAdded(

services/tracing/public/cpp/perfetto/posix_system_producer.cc

@@ -399,6 +399,11 @@ size_t PosixSystemProducer::shared_buffer_page_size_kb() const {
   return 0;
 }
 
+bool PosixSystemProducer::IsShmemProvidedByProducer() const {
+  NOTREACHED();
+  return false;
+}
+
 perfetto::SharedMemoryArbiter* PosixSystemProducer::MaybeSharedMemoryArbiter() {
   DCHECK(GetSerivce());
   return GetSerivce()->MaybeSharedMemoryArbiter();

services/tracing/public/cpp/perfetto/posix_system_producer.h

@@ -106,6 +106,10 @@ class COMPONENT_EXPORT(TRACING_CPP) PosixSystemProducer
   void RegisterTraceWriter(uint32_t writer_id, uint32_t target_buffer) override;
   void UnregisterTraceWriter(uint32_t writer_id) override;
 
+  // Used by PerfettoTracedProcess to create trace writers and send triggers.
+  perfetto::SharedMemoryArbiter* MaybeSharedMemoryArbiter() override;
+  void ActivateTriggers(const std::vector<std::string>&) override;
+
   // The rest of these perfetto::TracingService::ProducerEndpoint functions are
   // not currently used.
   void RegisterDataSource(const perfetto::DataSourceDescriptor&) override;
@@ -113,8 +117,7 @@ class COMPONENT_EXPORT(TRACING_CPP) PosixSystemProducer
   void NotifyDataSourceStarted(perfetto::DataSourceInstanceID) override;
   void NotifyDataSourceStopped(perfetto::DataSourceInstanceID) override;
   size_t shared_buffer_page_size_kb() const override;
-  perfetto::SharedMemoryArbiter* MaybeSharedMemoryArbiter() override;
-  void ActivateTriggers(const std::vector<std::string>&) override;
+  bool IsShmemProvidedByProducer() const override;
 
  protected:
   // Given our current |state_| determine how to properly connect and set up our

services/tracing/public/cpp/perfetto/producer_client.cc

@@ -269,6 +269,11 @@ void ProducerClient::ActivateTriggers(const std::vector<std::string>&) {
   NOTREACHED();
 }
 
+bool ProducerClient::IsShmemProvidedByProducer() const {
+  NOTREACHED();
+  return false;
+}
+
 void ProducerClient::CommitData(const perfetto::CommitDataRequest& commit,
                                 CommitDataCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

services/tracing/public/cpp/perfetto/producer_client.h

@@ -68,11 +68,13 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient
   void ClearIncrementalState() override;
 
   // perfetto::TracingService::ProducerEndpoint implementation.
+
   // Used by the TraceWriters
   // to signal Perfetto that shared memory chunks are ready
   // for consumption.
   void CommitData(const perfetto::CommitDataRequest& commit,
                   CommitDataCallback callback) override;
+
   // Used by the DataSource implementations to create TraceWriters
   // for writing their protobufs, and respond to flushes.
   void NotifyFlushComplete(perfetto::FlushRequestID) override;
@@ -80,6 +82,9 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient
   void RegisterTraceWriter(uint32_t writer_id, uint32_t target_buffer) override;
   void UnregisterTraceWriter(uint32_t writer_id) override;
 
+  // Used by PerfettoTracedProcess to create trace writers.
+  perfetto::SharedMemoryArbiter* MaybeSharedMemoryArbiter() override;
+
   // These ProducerEndpoint functions are only used on the service
   // side and should not be called on the clients.
   void RegisterDataSource(const perfetto::DataSourceDescriptor&) override;
@@ -88,7 +93,7 @@ class COMPONENT_EXPORT(TRACING_CPP) ProducerClient
   void NotifyDataSourceStarted(perfetto::DataSourceInstanceID) override;
   void ActivateTriggers(const std::vector<std::string>&) override;
   size_t shared_buffer_page_size_kb() const override;
-  perfetto::SharedMemoryArbiter* MaybeSharedMemoryArbiter() override;
+  bool IsShmemProvidedByProducer() const override;
 
   void BindClientAndHostPipesForTesting(
       mojo::PendingReceiver<mojom::ProducerClient>,

services/tracing/public/cpp/perfetto/shared_memory.cc

@@ -42,4 +42,8 @@ size_t MojoSharedMemory::size() const {
   return shared_buffer_->GetSize();
 }
 
+int MojoSharedMemory::fd() const {
+  return -1;
+}
+
 }  // namespace tracing

services/tracing/public/cpp/perfetto/shared_memory.h

@@ -42,6 +42,7 @@ class COMPONENT_EXPORT(TRACING_CPP) MojoSharedMemory
   // classes.
   void* start() const override;
   size_t size() const override;
+  int fd() const override;
 
  private:
   mojo::ScopedSharedBufferHandle shared_buffer_;