Merge "fix instruments imported on Mac" into main

poolsideai · Aug 31, 2024 · 8d0c476 · 8d0c476
2 parents 1fb0449 + 7a8a9be
commit 8d0c476
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/buildtools/BUILD.gn b/buildtools/BUILD.gn
@@ -1419,7 +1419,7 @@ config("no_format_warning") {
   cflags = [ "-Wno-format" ]
 }
 
-static_library("expat") {
+source_set("expat") {
   sources = [
     "expat/src/expat/lib/expat.h",
     "expat/src/expat/lib/xmlparse.c",

diff --git a/src/trace_processor/importers/instruments/instruments_xml_tokenizer.cc b/src/trace_processor/importers/instruments/instruments_xml_tokenizer.cc
@@ -19,6 +19,7 @@
 #include <map>
 
 #include <expat.h>
+#include <stdint.h>
 
 #include "perfetto/base/status.h"
 #include "perfetto/ext/base/status_or.h"
@@ -317,7 +318,7 @@ class InstrumentsXmlTokenizer::Impl {
         base::StatusOr<int64_t> trace_ts =
             ToTraceTimestamp(current_row_.timestamp_);
         if (!trace_ts.ok()) {
-          PERFETTO_DLOG("Skipping timestamp %ld, no clock snapshot yet",
+          PERFETTO_DLOG("Skipping timestamp %" PRId64 ", no clock snapshot yet",
                         current_row_.timestamp_);
         } else {
           context_->sorter->PushInstrumentsRow(*trace_ts,
@@ -330,7 +331,8 @@ class InstrumentsXmlTokenizer::Impl {
           PERFETTO_DCHECK(current_os_log_metadata_uint64_ref_ != nullptr);
           uint64_t clock_sync_timestamp = *current_os_log_metadata_uint64_ref_;
           if (latest_clock_sync_timestamp_ > clock_sync_timestamp) {
-            PERFETTO_DLOG("Skipping timestamp %ld, non-monotonic sync deteced",
+            PERFETTO_DLOG("Skipping timestamp %" PRId64
+                          ", non-monotonic sync deteced",
                           current_row_.timestamp_);
           } else {
             latest_clock_sync_timestamp_ = clock_sync_timestamp;