traceconv: implement function to go from text -> binary

Implement it in a very trivial way but better than not having it at
all

Author: LalitMaganti

src/traceconv/BUILD.gn

@@ -83,16 +83,16 @@ source_set("lib") {
     "../../include/perfetto/ext/traced:sys_stats_counters",
     "../../include/perfetto/protozero",
     "../../protos/perfetto/trace:zero",
-    "../../src/profiling:deobfuscator",
-    "../../src/profiling/symbolizer",
-    "../../src/profiling/symbolizer:symbolize_database",
-    "../../src/protozero:proto_ring_buffer",
-    "../../src/trace_processor:lib",
-    "../../src/trace_processor:storage_minimal",
-    "../../src/trace_processor/util:descriptors",
-    "../../src/trace_processor/util:gzip",
-    "../../src/trace_processor/util:protozero_to_text",
-    "../../src/trace_processor/util:trace_type",
+    "../profiling:deobfuscator",
+    "../profiling/symbolizer",
+    "../profiling/symbolizer:symbolize_database",
+    "../protozero:proto_ring_buffer",
+    "../trace_processor:lib",
+    "../trace_processor:storage_minimal",
+    "../trace_processor/util:descriptors",
+    "../trace_processor/util:gzip",
+    "../trace_processor/util:protozero_to_text",
+    "../trace_processor/util:trace_type",
   ]
   sources = [
     "deobfuscate_profile.cc",
@@ -119,10 +119,12 @@ source_set("lib") {
 
 source_set("main") {
   deps = [
+    ":gen_cc_trace_descriptor",
     ":lib",
     "../../gn:default_deps",
     "../../include/perfetto/ext/base:base",
     "../base:version",
+    "../protozero/text_to_proto",
   ]
   sources = [ "main.cc" ]
 }

src/traceconv/main.cc

@@ -14,18 +14,24 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <iostream>
-#include <limits>
+#include <iterator>
+#include <string>
 #include <vector>
 
+#include "perfetto/base/build_config.h"
 #include "perfetto/base/logging.h"
 #include "perfetto/ext/base/string_utils.h"
 #include "perfetto/ext/base/version.h"
+#include "src/protozero/text_to_proto/text_to_proto.h"
 #include "src/traceconv/deobfuscate_profile.h"
 #include "src/traceconv/symbolize_profile.h"
+#include "src/traceconv/trace.descriptor.h"
 #include "src/traceconv/trace_to_firefox.h"
 #include "src/traceconv/trace_to_hprof.h"
 #include "src/traceconv/trace_to_json.h"
@@ -41,8 +47,7 @@
 #include <unistd.h>
 #endif
 
-namespace perfetto {
-namespace trace_to_text {
+namespace perfetto::trace_to_text {
 namespace {
 
 int Usage(const char* argv0) {
@@ -51,7 +56,7 @@ int Usage(const char* argv0) {
       "Usage: %s MODE [OPTIONS] [input file] [output file]\n"
       "modes:\n"
       "  systrace|json|ctrace|text|profile|hprof|symbolize|deobfuscate|firefox"
-      "|java_heap_profile|decompress_packets\n"
+      "|java_heap_profile|decompress_packets|binary\n"
       "options:\n"
       "  [--truncate start|end]\n"
       "  [--full-sort]\n"
@@ -76,6 +81,23 @@ uint64_t StringToUint64OrDie(const char* str) {
   return number;
 }
 
+int TextToTrace(std::istream* input, std::ostream* output) {
+  std::string trace_text((std::istreambuf_iterator<char>(*input)),
+                         (std::istreambuf_iterator<char>()));
+  auto proto_status =
+      protozero::TextToProto(kTraceDescriptor.data(), kTraceDescriptor.size(),
+                             ".perfetto.protos.Trace", "trace", trace_text);
+  if (!proto_status.ok()) {
+    PERFETTO_ELOG("Failed to parse trace: %s",
+                  proto_status.status().c_message());
+    return 1;
+  }
+  const std::vector<uint8_t>& trace_proto = proto_status.value();
+  output->write(reinterpret_cast<const char*>(trace_proto.data()),
+                static_cast<int64_t>(trace_proto.size()));
+  return 0;
+}
+
 int Main(int argc, char** argv) {
   std::vector<const char*> positional_args;
   Keep truncate_keep = Keep::kAll;
@@ -88,8 +110,8 @@ int Main(int argc, char** argv) {
     if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0) {
       printf("%s\n", base::GetVersionString());
       return 0;
-    } else if (strcmp(argv[i], "-t") == 0 ||
-               strcmp(argv[i], "--truncate") == 0) {
+    }
+    if (strcmp(argv[i], "-t") == 0 || strcmp(argv[i], "--truncate") == 0) {
       i++;
       if (i <= argc && strcmp(argv[i], "start") == 0) {
         truncate_keep = Keep::kStart;
@@ -176,6 +198,10 @@ int Main(int argc, char** argv) {
     return 1;
   }
 
+  if (format == "binary") {
+    return TextToTrace(input_stream, output_stream);
+  }
+
   if (format == "json")
     return TraceToJson(input_stream, output_stream, /*compress=*/false,
                        truncate_keep, full_sort);
@@ -238,8 +264,7 @@ int Main(int argc, char** argv) {
 }
 
 }  // namespace
-}  // namespace trace_to_text
-}  // namespace perfetto
+}  // namespace perfetto::trace_to_text
 
 int main(int argc, char** argv) {
   return perfetto::trace_to_text::Main(argc, argv);