tp: classic-to-subcommand translation layer

Android.bp

@@ -16759,64 +16759,22 @@ filegroup {
     ],
 }
 
-// GN: //src/trace_processor/shell:interactive
+// GN: //src/trace_processor/shell:shell
 filegroup {
-    name: "perfetto_src_trace_processor_shell_interactive",
-    srcs: [
-        "src/trace_processor/shell/interactive.cc",
-    ],
-}
-
-// GN: //src/trace_processor/shell:metatrace
-filegroup {
-    name: "perfetto_src_trace_processor_shell_metatrace",
-    srcs: [
-        "src/trace_processor/shell/metatrace.cc",
-    ],
-}
-
-// GN: //src/trace_processor/shell:metrics
-filegroup {
-    name: "perfetto_src_trace_processor_shell_metrics",
-    srcs: [
-        "src/trace_processor/shell/metrics.cc",
-    ],
-}
-
-// GN: //src/trace_processor/shell:query
-filegroup {
-    name: "perfetto_src_trace_processor_shell_query",
-    srcs: [
-        "src/trace_processor/shell/query.cc",
-    ],
-}
-
-// GN: //src/trace_processor/shell:shell_utils
-filegroup {
-    name: "perfetto_src_trace_processor_shell_shell_utils",
-    srcs: [
-        "src/trace_processor/shell/shell_utils.cc",
-    ],
-}
-
-// GN: //src/trace_processor/shell:sql_packages
-filegroup {
-    name: "perfetto_src_trace_processor_shell_sql_packages",
-    srcs: [
-        "src/trace_processor/shell/sql_packages.cc",
-    ],
-}
-
-// GN: //src/trace_processor/shell:subcommand
-filegroup {
-    name: "perfetto_src_trace_processor_shell_subcommand",
+    name: "perfetto_src_trace_processor_shell_shell",
     srcs: [
         "src/trace_processor/shell/common_flags.cc",
         "src/trace_processor/shell/export_subcommand.cc",
+        "src/trace_processor/shell/interactive.cc",
         "src/trace_processor/shell/interactive_subcommand.cc",
+        "src/trace_processor/shell/metatrace.cc",
+        "src/trace_processor/shell/metrics.cc",
         "src/trace_processor/shell/metrics_subcommand.cc",
+        "src/trace_processor/shell/query.cc",
         "src/trace_processor/shell/query_subcommand.cc",
         "src/trace_processor/shell/server_subcommand.cc",
+        "src/trace_processor/shell/shell_utils.cc",
+        "src/trace_processor/shell/sql_packages.cc",
         "src/trace_processor/shell/subcommand.cc",
         "src/trace_processor/shell/summarize_subcommand.cc",
     ],
@@ -17155,13 +17113,7 @@ cc_library_static {
         ":perfetto_src_trace_processor_rpc_httpd",
         ":perfetto_src_trace_processor_rpc_rpc",
         ":perfetto_src_trace_processor_rpc_stdiod",
-        ":perfetto_src_trace_processor_shell_interactive",
-        ":perfetto_src_trace_processor_shell_metatrace",
-        ":perfetto_src_trace_processor_shell_metrics",
-        ":perfetto_src_trace_processor_shell_query",
-        ":perfetto_src_trace_processor_shell_shell_utils",
-        ":perfetto_src_trace_processor_shell_sql_packages",
-        ":perfetto_src_trace_processor_shell_subcommand",
+        ":perfetto_src_trace_processor_shell_shell",
         ":perfetto_src_trace_processor_sorter_sorter",
         ":perfetto_src_trace_processor_sqlite_bindings_bindings",
         ":perfetto_src_trace_processor_sqlite_sqlite",
@@ -19609,13 +19561,7 @@ cc_test {
         ":perfetto_src_trace_processor_rpc_rpc",
         ":perfetto_src_trace_processor_rpc_stdiod",
         ":perfetto_src_trace_processor_rpc_unittests",
-        ":perfetto_src_trace_processor_shell_interactive",
-        ":perfetto_src_trace_processor_shell_metatrace",
-        ":perfetto_src_trace_processor_shell_metrics",
-        ":perfetto_src_trace_processor_shell_query",
-        ":perfetto_src_trace_processor_shell_shell_utils",
-        ":perfetto_src_trace_processor_shell_sql_packages",
-        ":perfetto_src_trace_processor_shell_subcommand",
+        ":perfetto_src_trace_processor_shell_shell",
         ":perfetto_src_trace_processor_shell_unittests",
         ":perfetto_src_trace_processor_sorter_sorter",
         ":perfetto_src_trace_processor_sorter_unittests",

BUILD

@@ -642,13 +642,7 @@ perfetto_cc_library(
         ":src_trace_processor_rpc_httpd",
         ":src_trace_processor_rpc_rpc",
         ":src_trace_processor_rpc_stdiod",
-        ":src_trace_processor_shell_interactive",
-        ":src_trace_processor_shell_metatrace",
-        ":src_trace_processor_shell_metrics",
-        ":src_trace_processor_shell_query",
-        ":src_trace_processor_shell_shell_utils",
-        ":src_trace_processor_shell_sql_packages",
-        ":src_trace_processor_shell_subcommand",
+        ":src_trace_processor_shell_shell",
         ":src_trace_processor_sorter_sorter",
         ":src_trace_processor_sqlite_bindings_bindings",
         ":src_trace_processor_sqlite_sqlite",
@@ -4089,76 +4083,34 @@ perfetto_filegroup(
     ],
 )
 
-# GN target: //src/trace_processor/shell:interactive
+# GN target: //src/trace_processor/shell:shell
 perfetto_filegroup(
-    name = "src_trace_processor_shell_interactive",
-    srcs = [
-        "src/trace_processor/shell/interactive.cc",
-        "src/trace_processor/shell/interactive.h",
-    ],
-)
-
-# GN target: //src/trace_processor/shell:metatrace
-perfetto_filegroup(
-    name = "src_trace_processor_shell_metatrace",
-    srcs = [
-        "src/trace_processor/shell/metatrace.cc",
-        "src/trace_processor/shell/metatrace.h",
-    ],
-)
-
-# GN target: //src/trace_processor/shell:metrics
-perfetto_filegroup(
-    name = "src_trace_processor_shell_metrics",
-    srcs = [
-        "src/trace_processor/shell/metrics.cc",
-        "src/trace_processor/shell/metrics.h",
-    ],
-)
-
-# GN target: //src/trace_processor/shell:query
-perfetto_filegroup(
-    name = "src_trace_processor_shell_query",
-    srcs = [
-        "src/trace_processor/shell/query.cc",
-        "src/trace_processor/shell/query.h",
-    ],
-)
-
-# GN target: //src/trace_processor/shell:shell_utils
-perfetto_filegroup(
-    name = "src_trace_processor_shell_shell_utils",
-    srcs = [
-        "src/trace_processor/shell/shell_utils.cc",
-        "src/trace_processor/shell/shell_utils.h",
-    ],
-)
-
-# GN target: //src/trace_processor/shell:sql_packages
-perfetto_filegroup(
-    name = "src_trace_processor_shell_sql_packages",
-    srcs = [
-        "src/trace_processor/shell/sql_packages.cc",
-        "src/trace_processor/shell/sql_packages.h",
-    ],
-)
-
-# GN target: //src/trace_processor/shell:subcommand
-perfetto_filegroup(
-    name = "src_trace_processor_shell_subcommand",
+    name = "src_trace_processor_shell_shell",
     srcs = [
         "src/trace_processor/shell/common_flags.cc",
         "src/trace_processor/shell/common_flags.h",
         "src/trace_processor/shell/export_subcommand.cc",
         "src/trace_processor/shell/export_subcommand.h",
+        "src/trace_processor/shell/interactive.cc",
+        "src/trace_processor/shell/interactive.h",
         "src/trace_processor/shell/interactive_subcommand.cc",
         "src/trace_processor/shell/interactive_subcommand.h",
+        "src/trace_processor/shell/metatrace.cc",
+        "src/trace_processor/shell/metatrace.h",
+        "src/trace_processor/shell/metrics.cc",
+        "src/trace_processor/shell/metrics.h",
         "src/trace_processor/shell/metrics_subcommand.cc",
         "src/trace_processor/shell/metrics_subcommand.h",
+        "src/trace_processor/shell/query.cc",
+        "src/trace_processor/shell/query.h",
         "src/trace_processor/shell/query_subcommand.cc",
         "src/trace_processor/shell/query_subcommand.h",
         "src/trace_processor/shell/server_subcommand.cc",
         "src/trace_processor/shell/server_subcommand.h",
+        "src/trace_processor/shell/shell_utils.cc",
+        "src/trace_processor/shell/shell_utils.h",
+        "src/trace_processor/shell/sql_packages.cc",
+        "src/trace_processor/shell/sql_packages.h",
         "src/trace_processor/shell/subcommand.cc",
         "src/trace_processor/shell/subcommand.h",
         "src/trace_processor/shell/summarize_subcommand.cc",

src/trace_processor/BUILD.gn

@@ -254,23 +254,14 @@ if (enable_perfetto_trace_processor_sqlite) {
       "perfetto_sql/generator",
       "rpc",
       "rpc:stdiod",
-      "shell:interactive",
-      "shell:metatrace",
-      "shell:metrics",
-      "shell:query",
-      "shell:shell_utils",
-      "shell:sql_packages",
-      "shell:subcommand",
+      "shell",
       "sqlite",
       "trace_summary",
       "util:stdlib",
       "util/deobfuscation:deobfuscator",
       "util/symbolizer",
       "util/symbolizer:symbolize_database",
     ]
-    if (enable_perfetto_trace_processor_linenoise) {
-      deps += [ "../../gn:linenoise" ]
-    }
     if (enable_perfetto_trace_processor_httpd) {
       deps += [ "rpc:httpd" ]
     }

src/trace_processor/shell/BUILD.gn

@@ -14,32 +14,38 @@
 
 import("../../../gn/perfetto.gni")
 
-source_set("subcommand") {
+source_set("shell") {
   sources = [
     "common_flags.cc",
     "common_flags.h",
     "export_subcommand.cc",
     "export_subcommand.h",
+    "interactive.cc",
+    "interactive.h",
     "interactive_subcommand.cc",
     "interactive_subcommand.h",
+    "metatrace.cc",
+    "metatrace.h",
+    "metrics.cc",
+    "metrics.h",
     "metrics_subcommand.cc",
     "metrics_subcommand.h",
+    "query.cc",
+    "query.h",
     "query_subcommand.cc",
     "query_subcommand.h",
     "server_subcommand.cc",
     "server_subcommand.h",
+    "shell_utils.cc",
+    "shell_utils.h",
+    "sql_packages.cc",
+    "sql_packages.h",
     "subcommand.cc",
     "subcommand.h",
     "summarize_subcommand.cc",
     "summarize_subcommand.h",
   ]
   deps = [
-    ":interactive",
-    ":metatrace",
-    ":metrics",
-    ":query",
-    ":shell_utils",
-    ":sql_packages",
     "../../../gn:default_deps",
     "../../../gn:protobuf_full",
     "../../../include/perfetto/ext/trace_processor:trace_processor_shell",
@@ -50,103 +56,25 @@ source_set("subcommand") {
     "../rpc",
     "../rpc:stdiod",
     "../trace_summary",
+    "../util:stdlib",
     "../util/deobfuscation:deobfuscator",
+    "../util/symbolizer",
     "../util/symbolizer:symbolize_database",
   ]
-  if (enable_perfetto_trace_processor_httpd) {
-    deps += [ "../rpc:httpd" ]
-  }
-  public_deps = [ "../../../include/perfetto/trace_processor:trace_processor" ]
-}
-
-source_set("interactive") {
-  sources = [
-    "interactive.cc",
-    "interactive.h",
-  ]
-  deps = [
-    ":metrics",
-    ":query",
-    ":shell_utils",
-    "../../../gn:default_deps",
-    "../../base",
-  ]
   if (enable_perfetto_trace_processor_linenoise) {
     deps += [ "../../../gn:linenoise" ]
   }
-  public_deps = [ "../../../include/perfetto/trace_processor:trace_processor" ]
-}
-
-source_set("metatrace") {
-  sources = [
-    "metatrace.cc",
-    "metatrace.h",
-  ]
-  deps = [
-    "../../../gn:default_deps",
-    "../../base",
-  ]
-  public_deps = [ "../../../include/perfetto/trace_processor:trace_processor" ]
-}
-
-source_set("metrics") {
-  sources = [
-    "metrics.cc",
-    "metrics.h",
-  ]
-  deps = [
-    "../../../gn:default_deps",
-    "../../base",
-    "../metrics",
-  ]
-  public_deps = [
-    "../../../gn:protobuf_full",
-    "../../../include/perfetto/trace_processor:trace_processor",
-  ]
-}
-
-source_set("sql_packages") {
-  sources = [
-    "sql_packages.cc",
-    "sql_packages.h",
-  ]
-  deps = [
-    "../../../gn:default_deps",
-    "../../base",
-    "../util:stdlib",
-  ]
-  public_deps = [ "../../../include/perfetto/trace_processor:trace_processor" ]
-}
-
-source_set("shell_utils") {
-  sources = [
-    "shell_utils.cc",
-    "shell_utils.h",
-  ]
-  deps = [
-    "../../../gn:default_deps",
-    "../../base",
-  ]
-  public_deps = [ "../../../include/perfetto/trace_processor:trace_processor" ]
-}
-
-source_set("query") {
-  sources = [
-    "query.cc",
-    "query.h",
-  ]
-  deps = [
-    "../../../gn:default_deps",
-    "../../base",
-  ]
+  if (enable_perfetto_trace_processor_httpd) {
+    deps += [ "../rpc:httpd" ]
+  }
   public_deps = [ "../../../include/perfetto/trace_processor:trace_processor" ]
 }
 
 source_set("unittests") {
   testonly = true
   sources = [ "find_subcommand_unittest.cc" ]
   deps = [
-    ":subcommand",
+    ":shell",
     "../../../gn:default_deps",
     "../../../gn:gtest_and_gmock",
     "../../base",