tp: fix failing tests on debug

Change-Id: I4b7be1127456b8d163261d785a9d84e53687df43
google · Oct 21, 2024 · 717f7bd · 717f7bd
1 parent 7a7ed30
commit 717f7bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/trace_processor/importers/common/track_tracker.cc b/src/trace_processor/importers/common/track_tracker.cc
@@ -87,8 +87,9 @@ bool IsLegacyCharArrayNameAllowed(tracks::TrackClassification classification) {
          classification == tracks::cpu_frequency_throttle ||
          classification == tracks::cpu_idle ||
          classification == tracks::cpu_user_time ||
+         classification == tracks::cpu_nice_user_time ||
          classification == tracks::cpu_system_mode_time ||
-         classification == tracks::cpu_idleTime ||
+         classification == tracks::cpu_idle_time ||
          classification == tracks::cpu_io_wait_time ||
          classification == tracks::cpu_irq_time ||
          classification == tracks::cpu_softirq_time ||

diff --git a/src/trace_processor/importers/common/tracks.h b/src/trace_processor/importers/common/tracks.h
@@ -41,7 +41,7 @@ namespace perfetto::trace_processor::tracks {
   F(cpu_funcgraph)                               \
   F(cpu_idle_state)                              \
   F(cpu_idle)                                    \
-  F(cpu_idleTime)                                \
+  F(cpu_idle_time)                               \
   F(cpu_io_wait_time)                            \
   F(cpu_irq_time)                                \
   F(cpu_irq)                                     \

diff --git a/src/trace_processor/importers/proto/system_probes_parser.cc b/src/trace_processor/importers/proto/system_probes_parser.cc
@@ -395,7 +395,7 @@ void SystemProbesParser::ParseSysStats(int64_t ts, ConstBytes blob) {
         ts, static_cast<double>(ct.system_mode_ns()), track);
 
     track = context_->track_tracker->InternCpuCounterTrack(
-        tracks::cpu_idleTime, ct.cpu_id(),
+        tracks::cpu_idle_time, ct.cpu_id(),
         TrackTracker::LegacyCharArrayName{"cpu.times.idle_ns"});
     context_->event_tracker->PushCounter(ts, static_cast<double>(ct.idle_ns()),
                                          track);