Update Perfetto and fix tests

cmake/Packages.cmake

@@ -483,7 +483,7 @@ omnitrace_checkout_git_submodule(
     RELATIVE_PATH external/perfetto
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     REPO_URL https://android.googlesource.com/platform/external/perfetto
-    REPO_BRANCH v28.0
+    REPO_BRANCH v46.0
     TEST_FILE sdk/perfetto.cc)
 
 include(Perfetto)

cmake/Perfetto.cmake

@@ -67,10 +67,10 @@ if(CMAKE_CXX_COMPILER_IS_CLANG)
 else()
     set(PERFETTO_IS_CLANG false)
     set(OMNITRACE_PERFETTO_C_FLAGS
-        "-static-libgcc -Wno-maybe-uninitialized"
+        "-static-libgcc -Wno-maybe-uninitialized -Wno-stringop-overflow"
         CACHE STRING "Perfetto C flags")
     set(OMNITRACE_PERFETTO_CXX_FLAGS
-        "-static-libgcc -Wno-maybe-uninitialized"
+        "-static-libgcc -Wno-maybe-uninitialized -Wno-stringop-overflow"
         CACHE STRING "Perfetto C++ flags")
 endif()
 

cmake/Templates/args.gn.in

@@ -8,19 +8,19 @@ is_clang = @PERFETTO_IS_CLANG@
 is_hermetic_clang = false
 
 enable_perfetto_benchmarks = false
-enable_perfetto_integration_tests = false
+enable_perfetto_integration_tests = true
 enable_perfetto_unittests = false
 enable_perfetto_fuzzers = false
 
 # enable_perfetto_stderr_crash_dump = false
 enable_perfetto_heapprofd = false
 enable_perfetto_tools = false
-enable_perfetto_trace_processor = false
-enable_perfetto_trace_processor_httpd = false
+enable_perfetto_trace_processor = true
+enable_perfetto_trace_processor_httpd = true
 enable_perfetto_trace_processor_json = false
 enable_perfetto_trace_processor_linenoise = false
 enable_perfetto_trace_processor_percentile = false
-enable_perfetto_trace_processor_sqlite = false
+enable_perfetto_trace_processor_sqlite = true
 enable_perfetto_ui = false
 
 extra_cflags = "@OMNITRACE_PERFETTO_C_FLAGS@"

source/lib/core/perfetto.hpp

@@ -109,11 +109,12 @@ perfetto_counter_track<Tp>::emplace(size_t _idx, const std::string& _v,
     auto        _index     = _track_data.size();
     auto&       _name      = _name_data.emplace_back(std::make_unique<std::string>(_v));
     const char* _unit_name = (_units && strlen(_units) > 0) ? _units : nullptr;
-    _track_data.emplace_back(::perfetto::CounterTrack{ _name->c_str() }
-                                 .set_unit_name(_unit_name)
-                                 .set_category(_category)
-                                 .set_unit_multiplier(_mult)
-                                 .set_is_incremental(_incr));
+    _track_data.emplace_back(
+        ::perfetto::CounterTrack{ ::perfetto::DynamicString{ _name->c_str() } }
+            .set_unit_name(_unit_name)
+            .set_category(_category)
+            .set_unit_multiplier(_mult)
+            .set_is_incremental(_incr));
     if(config::get_is_continuous_integration())
     {
         for(auto& itr : _missing)

source/lib/omnitrace/library/tracing.hpp

@@ -642,14 +642,14 @@ mark_perfetto_ts(CategoryT, const char* name, uint64_t _ts, Args&&... args)
 
 template <typename CategoryT, typename... Args>
 inline void
-mark_perfetto_track(CategoryT, const char*, ::perfetto::Track _track, uint64_t _ts,
+mark_perfetto_track(CategoryT, const char* name, ::perfetto::Track _track, uint64_t _ts,
                     Args&&... args)
 {
     // skip if category is disabled
     if(category_mark_disabled<CategoryT>()) return;
 
-    TRACE_EVENT_INSTANT(trait::name<CategoryT>::value, _track, _ts,
-                        std::forward<Args>(args)...);
+    TRACE_EVENT_INSTANT(trait::name<CategoryT>::value, ::perfetto::DynamicString{ name },
+                        _track, _ts, std::forward<Args>(args)...);
 }
 }  // namespace tracing
 }  // namespace omnitrace

tests/omnitrace-python-tests.cmake

@@ -166,7 +166,8 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
             NAME ${TEST_NAME}-validate-perfetto
             COMMAND
                 ${_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py
-                -m ${TEST_PERFETTO_METRIC} ${TEST_ARGS} -p -i
+                -m ${TEST_PERFETTO_METRIC} ${TEST_ARGS} -p -t
+                ${OMNITRACE_PERFETTO_BINARY_DIR}/trace_processor_shell -i
             PYTHON_VERSION ${_VERSION}
             FILE omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE}
             DEPENDS ${TEST_NAME}-${_VERSION}

tests/omnitrace-testing.cmake

@@ -985,6 +985,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST)
                 ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py -m
                 "${TEST_PERFETTO_METRIC}" ${TEST_ARGS} -i
                 ${PROJECT_BINARY_DIR}/omnitrace-tests-output/${TEST_NAME}/${TEST_PERFETTO_FILE}
+                -t ${OMNITRACE_PERFETTO_BINARY_DIR}/trace_processor_shell
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
     endif()
 

tests/validate-perfetto-proto.py

@@ -2,18 +2,22 @@
 
 import sys
 import argparse
-from perfetto.trace_processor import TraceProcessor
+from perfetto.trace_processor import TraceProcessor, TraceProcessorConfig
 
 
-def load_trace(inp, max_tries=5, retry_wait=1):
+def load_trace(inp, max_tries=5, retry_wait=1, bin_path=None):
     """Occasionally connecting to the trace processor fails with HTTP errors
     so this function tries to reduce spurious test failures"""
 
     n = 0
     tp = None
     while tp is None:
         try:
-            tp = TraceProcessor(trace=(inp))
+            if bin_path:
+                config = TraceProcessorConfig(bin_path=bin_path)
+                tp = TraceProcessor(trace=(inp), config=config)
+            else:
+                tp = TraceProcessor(trace=(inp))
             break
         except Exception as e:
             sys.stderr.write(f"{e}\n")
@@ -71,6 +75,9 @@ def validate_perfetto(data, labels, counts, depths):
         "-p", "--print", action="store_true", help="Print the processed perfetto data"
     )
     parser.add_argument("-i", "--input", type=str, help="Input file", required=True)
+    parser.add_argument(
+        "-t", "--trace_processor_shell", type=str, help="Path of trace_processor_shell"
+    )
     parser.add_argument(
         "--key-names",
         type=str,
@@ -93,7 +100,7 @@ def validate_perfetto(data, labels, counts, depths):
             "The same number of labels, counts, and depths must be specified"
         )
 
-    tp = load_trace(args.input)
+    tp = load_trace(args.input, bin_path=args.trace_processor_shell)
 
     if tp is None:
         raise ValueError(f"trace {args.input} could not be loaded")