commit 3f2024e04595c52781899612891e6782c3f5c6fa
author Ryan Savitski <rsavitski@google.com> Fri May 10 19:56:07 2019 +0100
committer Ryan Savitski <rsavitski@google.com> Fri May 10 18:57:08 2019 +0000
tree e427c27b329f1c57dde8e9c47c361a69ddf9f580
parent 0e1901c5709fc93276080c5f91cac065e01c7fdf

ftrace_controller debug print: support >64 cpus (bitset is 128 wide)

#first-world-problems

Change-Id: I356104b3cbaa62956137504f476eef3a27209325

src/traced/probes/ftrace/ftrace_controller.cc

diff --git a/src/traced/probes/ftrace/ftrace_controller.cc b/src/traced/probes/ftrace/ftrace_controller.cc
index eff8262..07c0216 100644
--- a/src/traced/probes/ftrace/ftrace_controller.cc
+++ b/src/traced/probes/ftrace/ftrace_controller.cc
@@ -364,18 +364,18 @@
   if (flush_request_id != cur_flush_request_id_)
     return;
 
-  uint64_t acks = 0;  // For debugging purposes only.
+  std::string acks;  // For debugging purposes only.
   {
     // Unlock the cpu readers and move on.
     std::unique_lock<std::mutex> lock(thread_sync_.mutex);
-    acks = thread_sync_.flush_acks.to_ulong();
+    acks = thread_sync_.flush_acks.to_string();
     thread_sync_.flush_acks.reset();
     if (thread_sync_.cmd == FtraceThreadSync::kFlush)
       IssueThreadSyncCmd(FtraceThreadSync::kRun, std::move(lock));
   }
 
-  PERFETTO_ELOG("Ftrace flush(%" PRIu64 ") timed out. Acked cpus: 0x%" PRIx64,
-                flush_request_id, acks);
+  PERFETTO_ELOG("Ftrace flush(%" PRIu64 ") timed out. Acked cpus mask: [%s]",
+                flush_request_id, acks.c_str());
   cur_flush_request_id_ = 0;
   NotifyFlushCompleteToStartedDataSources(flush_request_id);
 }