perfetto: point profile scripts at trace_processor_shell [DO NOT MERGE until v58]

BUILD.gn

@@ -60,22 +60,14 @@ if (enable_perfetto_trace_processor) {
 }
 
 if (enable_perfetto_traceconv) {
-  all_targets += [
-    "src/traceconv",
-    "src/proto_utils",
-  ]
+  # The standalone traceconv host binary has been folded into
+  # trace_processor_shell (the convert/bundle/util subcommands), so it is no
+  # longer built here. The src/traceconv:lib conversion code is pulled in
+  # directly by the shell, and the UI's traceconv WASM module is built via
+  # ui/BUILD.gn.
+  all_targets += [ "src/proto_utils" ]
   if (is_cross_compiling) {
-    # In many cross-compilation scenarios (typically Android) developers expect
-    # the host version of traceconv to be available somewhere in out/, so
-    # they can convert Android traces on their dev machine. Also
-    # tools/gen_android_bp explicitly depends on the host version for the
-    # cc_binary_host("traceconv") target in Android.bp.
-    # Note that when cross-compiling the host executable will be available in
-    # out/xxx/gcc_like_host/traceconv NOT just out/xxx/traceconv.
-    all_targets += [
-      "src/traceconv($host_toolchain)",
-      "src/proto_utils($host_toolchain)",
-    ]
+    all_targets += [ "src/proto_utils($host_toolchain)" ]
   }
 }
 

gn/perfetto_integrationtests.gni

@@ -49,6 +49,8 @@ if (enable_perfetto_trace_processor && perfetto_build_standalone &&
     !is_android) {
   perfetto_integrationtests_targets +=
       [ "src/trace_processor:integrationtests" ]
+  perfetto_integrationtests_targets +=
+      [ "src/trace_processor/shell:integrationtests" ]
   perfetto_integrationtests_targets += [ "src/traceconv:integrationtests" ]
   perfetto_integrationtests_data_targets +=
       [ "protos/perfetto/trace:test_extensions_slim_descriptor" ]

infra/luci/recipes/perfetto.py

@@ -43,9 +43,6 @@
     {
         'name': 'trace_processor_shell'
     },
-    {
-        'name': 'traceconv',
-    },
     {
         'name': 'tracebox',
         'exclude_platforms': ['windows-amd64']

src/trace_processor/shell/BUILD.gn

@@ -126,3 +126,20 @@ source_set("unittests") {
     "../../base",
   ]
 }
+
+if (enable_perfetto_integration_tests) {
+  source_set("integrationtests") {
+    testonly = true
+    sources = [ "bundle_integrationtest.cc" ]
+    deps = [
+      "..:trace_processor_shell_lib",
+      "../../../gn:default_deps",
+      "../../../gn:gtest_and_gmock",
+      "../../../include/perfetto/ext/base",
+      "../../../include/perfetto/ext/trace_processor:trace_processor_shell",
+      "../../../protos/perfetto/trace:cpp",
+      "../../../protos/perfetto/trace/profiling:cpp",
+      "../../base:test_support",
+    ]
+  }
+}

src/traceconv/traceconv_bundle_integrationtest.cc → src/trace_processor/shell/bundle_integrationtest.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "perfetto/ext/traceconv/traceconv.h"
+#include "perfetto/ext/trace_processor/trace_processor_shell.h"
 
 #include <cstdlib>
 #include <cstring>
@@ -31,12 +31,13 @@
 #include "src/base/test/utils.h"
 #include "test/gtest_and_gmock.h"
 
-namespace perfetto::traceconv {
+namespace perfetto::trace_processor {
 namespace {
 
 using testing::UnorderedElementsAre;
 
-// Helper: builds an argv from owned strings and invokes TraceconvMain.
+// Helper: builds an argv from owned strings and invokes the shell's `bundle`
+// subcommand via TraceProcessorShellMain.
 class ArgvInvoker {
  public:
   void Add(const std::string& arg) { args_.push_back(arg); }
@@ -45,7 +46,7 @@ class ArgvInvoker {
     for (auto& s : args_) {
       argv.push_back(s.data());
     }
-    return TraceconvMain(static_cast<int>(argv.size()), argv.data());
+    return TraceProcessorShellMain(static_cast<int>(argv.size()), argv.data());
   }
 
  private:
@@ -131,7 +132,7 @@ TEST_F(TraceconvBundleTest, BundleWithProguardMap) {
       "    void bar() -> b\n");
 
   ArgvInvoker invoker;
-  invoker.Add("traceconv");
+  invoker.Add("trace_processor_shell");
   invoker.Add("bundle");
   invoker.Add("--no-auto-symbol-paths");
   invoker.Add("--proguard-map");
@@ -176,7 +177,7 @@ TEST_F(TraceconvBundleTest, BundleWithRepeatedProguardMaps) {
   base::TempFile map2 = WriteTempFile("com.example.Bar -> b.b:\n");
 
   ArgvInvoker invoker;
-  invoker.Add("traceconv");
+  invoker.Add("trace_processor_shell");
   invoker.Add("bundle");
   invoker.Add("--no-auto-symbol-paths");
   invoker.Add("--proguard-map");
@@ -200,7 +201,7 @@ TEST_F(TraceconvBundleTest, BundleWithProguardMapNoPackage) {
   base::TempFile mapping = WriteTempFile("com.example.Foo -> a.a:\n");
 
   ArgvInvoker invoker;
-  invoker.Add("traceconv");
+  invoker.Add("trace_processor_shell");
   invoker.Add("bundle");
   invoker.Add("--no-auto-symbol-paths");
   invoker.Add("--proguard-map");
@@ -224,7 +225,7 @@ TEST_F(TraceconvBundleTest, BundleWithProguardMapNoPackage) {
 // Explicit --proguard-map pointing at a missing file must fail the command.
 TEST_F(TraceconvBundleTest, BundleWithMissingProguardMapFails) {
   ArgvInvoker invoker;
-  invoker.Add("traceconv");
+  invoker.Add("trace_processor_shell");
   invoker.Add("bundle");
   invoker.Add("--no-auto-symbol-paths");
   invoker.Add("--proguard-map");
@@ -238,7 +239,7 @@ TEST_F(TraceconvBundleTest, BundleWithMissingProguardMapFails) {
 // --proguard-map with no following argument is a usage error.
 TEST_F(TraceconvBundleTest, BundleProguardMapMissingArgFails) {
   ArgvInvoker invoker;
-  invoker.Add("traceconv");
+  invoker.Add("trace_processor_shell");
   invoker.Add("bundle");
   invoker.Add("--proguard-map");
 
@@ -253,7 +254,7 @@ TEST_F(TraceconvBundleTest, BundleNoAutoProguardMapsWithExplicit) {
   base::TempFile mapping = WriteTempFile("com.example.Foo -> a.a:\n");
 
   ArgvInvoker invoker;
-  invoker.Add("traceconv");
+  invoker.Add("trace_processor_shell");
   invoker.Add("bundle");
   invoker.Add("--no-auto-symbol-paths");
   invoker.Add("--no-auto-proguard-maps");
@@ -271,4 +272,4 @@ TEST_F(TraceconvBundleTest, BundleNoAutoProguardMapsWithExplicit) {
 }
 
 }  // namespace
-}  // namespace perfetto::traceconv
+}  // namespace perfetto::trace_processor

src/traceconv/BUILD.gn

@@ -18,13 +18,11 @@ import("../../gn/perfetto_host_executable.gni")
 import("../../gn/test.gni")
 import("../../gn/wasm.gni")
 
-executable("traceconv") {
-  testonly = true
-  deps = [
-    ":main",
-    "../../gn:default_deps",
-  ]
-}
+# NOTE: there is no longer a standalone "traceconv" executable. The host CLI is
+# now trace_processor_shell (the convert/bundle/util subcommands, plus
+# traceconv-name compatibility), and the conversion implementation below
+# (":lib") is linked directly by the shell. The only artifact still built from
+# this directory is the UI's "traceconv" WASM module (wasm_lib below).
 
 source_set("utils") {
   deps = [
@@ -119,28 +117,6 @@ source_set("lib") {
   ]
 }
 
-source_set("main") {
-  deps = [
-    ":traceconv_lib",
-    "../../gn:default_deps",
-  ]
-  sources = [ "main.cc" ]
-}
-
-source_set("traceconv_lib") {
-  deps = [
-    ":gen_cc_android_extension_descriptor",
-    ":gen_cc_trace_descriptor",
-    ":lib",
-    "../../gn:default_deps",
-    "../../include/perfetto/ext/base:base",
-    "../base:version",
-    "../protozero/text_to_proto",
-  ]
-  public_deps = [ "../../include/perfetto/ext/traceconv:traceconv" ]
-  sources = [ "traceconv.cc" ]
-}
-
 if (enable_perfetto_ui) {
   wasm_lib("traceconv_wasm") {
     name = "traceconv"
@@ -149,9 +125,14 @@ if (enable_perfetto_ui) {
     enable_web_environment = true
     enable_filesystem = true
     deps = [
-      ":main",
+      ":gen_cc_android_extension_descriptor",
+      ":gen_cc_trace_descriptor",
+      ":lib",
       "../../gn:default_deps",
+      "../../include/perfetto/ext/base:base",
+      "../protozero/text_to_proto",
     ]
+    sources = [ "wasm_main.cc" ]
   }
 }
 
@@ -170,7 +151,6 @@ if (enable_perfetto_integration_tests) {
     testonly = true
     deps = [
       ":lib",
-      ":traceconv_lib",
       "../../gn:default_deps",
       "../../gn:gtest_and_gmock",
       "../../include/perfetto/base",
@@ -186,7 +166,6 @@ if (enable_perfetto_integration_tests) {
       "pprof_reader.h",
       "trace_to_pprof_integrationtest.cc",
       "trace_to_text_integrationtest.cc",
-      "traceconv_bundle_integrationtest.cc",
     ]
   }
 }