commit b6de48b142b669563afd310c6e66b3f83478607f
author Primiano Tucci <primiano@google.com> Thu Jul 26 16:00:44 2018 +0100
committer Primiano Tucci <primiano@google.com> Thu Jul 26 16:00:44 2018 +0100
tree ae6f6d858a4442722a856fff20ccce5927b9ebb6
parent 2d6b574f9d1004a9bb386a50358d97dd2ae00c2e

Non-functional refactorings of ftrace controller/sink/metadata

This CL mainly moves classes defined in ftrace_controller.{cc,h} into
their own files. This is in preparation of future refactorings to
clean that up. Specifically this CL:
- Move process_stats_data_source into its own ps/ folder
  (no code changes).
- Move FtraceSink and FtraceMetadata into their own .cc/.h files
  (no code changes).
- Avoid re-derefering the WeakPtr in ftrace_controller and cache the pointer
  after we establish it's still alive.

Bug: 73886018
Change-Id: Idbb214d277e4fd03d65678da413c168d0a3deb8a

Android.bp

diff --git a/Android.bp b/Android.bp
index e3e4fbe..0cd32cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,11 +70,13 @@
     "src/traced/probes/ftrace/ftrace_config.cc",
     "src/traced/probes/ftrace/ftrace_config_muxer.cc",
     "src/traced/probes/ftrace/ftrace_controller.cc",
+    "src/traced/probes/ftrace/ftrace_metadata.cc",
     "src/traced/probes/ftrace/ftrace_procfs.cc",
+    "src/traced/probes/ftrace/ftrace_sink.cc",
     "src/traced/probes/ftrace/proto_translation_table.cc",
     "src/traced/probes/probes.cc",
     "src/traced/probes/probes_producer.cc",
-    "src/traced/probes/process_stats_data_source.cc",
+    "src/traced/probes/ps/process_stats_data_source.cc",
     "src/traced/service/service.cc",
     "src/tracing/core/chrome_config.cc",
     "src/tracing/core/commit_data_request.cc",
@@ -325,12 +327,14 @@
     "src/traced/probes/ftrace/ftrace_config.cc",
     "src/traced/probes/ftrace/ftrace_config_muxer.cc",
     "src/traced/probes/ftrace/ftrace_controller.cc",
+    "src/traced/probes/ftrace/ftrace_metadata.cc",
     "src/traced/probes/ftrace/ftrace_procfs.cc",
     "src/traced/probes/ftrace/ftrace_procfs_integrationtest.cc",
+    "src/traced/probes/ftrace/ftrace_sink.cc",
     "src/traced/probes/ftrace/proto_translation_table.cc",
     "src/traced/probes/ftrace/test/cpu_reader_support.cc",
     "src/traced/probes/probes_producer.cc",
-    "src/traced/probes/process_stats_data_source.cc",
+    "src/traced/probes/ps/process_stats_data_source.cc",
     "src/tracing/core/chrome_config.cc",
     "src/tracing/core/commit_data_request.cc",
     "src/tracing/core/data_source_config.cc",
@@ -3725,14 +3729,16 @@
     "src/traced/probes/ftrace/ftrace_config_unittest.cc",
     "src/traced/probes/ftrace/ftrace_controller.cc",
     "src/traced/probes/ftrace/ftrace_controller_unittest.cc",
+    "src/traced/probes/ftrace/ftrace_metadata.cc",
     "src/traced/probes/ftrace/ftrace_procfs.cc",
     "src/traced/probes/ftrace/ftrace_procfs_unittest.cc",
+    "src/traced/probes/ftrace/ftrace_sink.cc",
     "src/traced/probes/ftrace/proto_translation_table.cc",
     "src/traced/probes/ftrace/proto_translation_table_unittest.cc",
     "src/traced/probes/ftrace/test/cpu_reader_support.cc",
     "src/traced/probes/probes_producer.cc",
-    "src/traced/probes/process_stats_data_source.cc",
-    "src/traced/probes/process_stats_data_source_unittest.cc",
+    "src/traced/probes/ps/process_stats_data_source.cc",
+    "src/traced/probes/ps/process_stats_data_source_unittest.cc",
     "src/tracing/core/chrome_config.cc",
     "src/tracing/core/commit_data_request.cc",
     "src/tracing/core/data_source_config.cc",