diff options
Diffstat (limited to 'chromium/services/tracing/public/cpp/perfetto/perfetto_traced_process.h')
| -rw-r--r-- | chromium/services/tracing/public/cpp/perfetto/perfetto_traced_process.h | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/chromium/services/tracing/public/cpp/perfetto/perfetto_traced_process.h b/chromium/services/tracing/public/cpp/perfetto/perfetto_traced_process.h index f855e2ecdd2..04688e44b87 100644 --- a/chromium/services/tracing/public/cpp/perfetto/perfetto_traced_process.h +++ b/chromium/services/tracing/public/cpp/perfetto/perfetto_traced_process.h @@ -6,10 +6,11 @@ #define SERVICES_TRACING_PUBLIC_CPP_PERFETTO_PERFETTO_TRACED_PROCESS_H_ #include "base/component_export.h" +#include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" -#include "base/sequenced_task_runner.h" #include "base/synchronization/lock.h" +#include "base/task/sequenced_task_runner.h" #include "base/thread_annotations.h" #include "base/trace_event/trace_event.h" #include "base/tracing/perfetto_task_runner.h" @@ -121,7 +122,7 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final private: uint64_t data_source_id_ = 0; std::string name_; - PerfettoProducer* producer_ = nullptr; + raw_ptr<PerfettoProducer> producer_ = nullptr; }; #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) @@ -166,6 +167,9 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final // Returns the process-wide instance of the PerfettoTracedProcess. static PerfettoTracedProcess* Get(); + PerfettoTracedProcess(const PerfettoTracedProcess&) = delete; + PerfettoTracedProcess& operator=(const PerfettoTracedProcess&) = delete; + // Provide a factory for lazily creating mojo consumer connections to the // tracing service. Allows using Perfetto's Client API for recording traces. using ConsumerConnectionFactory = mojom::TracingService& (*)(); @@ -203,7 +207,7 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final bool privacy_filtering_enabled); // Called on the process's main thread once the thread pool is ready. - void OnThreadPoolAvailable(); + void OnThreadPoolAvailable(bool enable_consumer); // Set a callback that returns whether a system tracing session is allowed. // The callback will be executed on the sequence that set it. Only a single @@ -235,10 +239,22 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final // Can be called on any thread, but only after OnThreadPoolAvailable(). void ActivateSystemTriggers(const std::vector<std::string>& triggers); - // Be careful when using ResetTaskRunnerForTesting. There is a PostTask in the + // Sets the task runner used by the tracing infrastructure in this process. + // The returned handle will automatically tear down tracing when destroyed, so + // it should be kept valid until the test terminates. + // + // Be careful when using SetupForTesting. There is a PostTask in the // constructor of PerfettoTracedProcess, so before this class is constructed // is the only safe time to call this. - static void ResetTaskRunnerForTesting( + struct COMPONENT_EXPORT(TRACING_CPP) TestHandle { + TestHandle() = default; + ~TestHandle(); + TestHandle(const TestHandle&) = delete; + TestHandle(TestHandle&&) = default; + TestHandle& operator=(const TestHandle&) = delete; + TestHandle& operator=(TestHandle&&) = default; + }; + static std::unique_ptr<TestHandle> SetupForTesting( scoped_refptr<base::SequencedTaskRunner> task_runner = nullptr); // Sets the ProducerClient (or SystemProducer) and returns the old pointer. If @@ -250,7 +266,6 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final std::unique_ptr<SystemProducer> producer); void ClearDataSourcesForTesting(); - static void DeleteSoonForTesting(std::unique_ptr<PerfettoTracedProcess>); base::tracing::PerfettoPlatform* perfetto_platform_for_testing() const { return platform_.get(); @@ -273,7 +288,9 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final // Initialize the Perfetto client library (i.e., perfetto::Tracing) for this // process. - void SetupClientLibrary(); + // |enable_consumer| should be true if the system consumer can be enabled. + // Currently this is only the case if this is running in the browser process. + void SetupClientLibrary(bool enable_consumer); // perfetto::TracingPolicy implementation: void ShouldAllowConsumerSession( @@ -315,7 +332,6 @@ class COMPONENT_EXPORT(TRACING_CPP) PerfettoTracedProcess final pending_producer_callback_; SEQUENCE_CHECKER(sequence_checker_); - DISALLOW_COPY_AND_ASSIGN(PerfettoTracedProcess); }; #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY) |