commit 20628f1026743778bc6ddbc3d1558071090c5905
author John Bates <jbates@chromium.org> Fri Apr 22 00:17:07 2022
committer John Bates <jbates@chromium.org> Fri Apr 22 15:12:08 2022
tree 5242aa160c4d819a948fc8a58d5ddd332ed15def
parent eab3108af8375ad7b90b2aa0cf0f9c8ac10387ba

perfetto: no cpufreq_period_ms for older perfetto versions

BUG=None
TEST=record_cros_trace --ssh dut-arcvm

Change-Id: I1d3d34e9b3a7d02abd3240adac48bf795af80b0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/graphics/+/3600887
Tested-by: John Bates <jbates@chromium.org>
Auto-Submit: John Bates <jbates@chromium.org>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>

src/perfetto/record_cros_trace

diff --git a/src/perfetto/record_cros_trace b/src/perfetto/record_cros_trace
index fad49f8..958a44f 100755
--- a/src/perfetto/record_cros_trace
+++ b/src/perfetto/record_cros_trace
@@ -139,6 +139,22 @@
   fi
 fi
 
+perfetto_cmd="perfetto"
+if [[ -n "${dut}" ]]; then
+  if [[ "${is_arcvm}" == true ]]; then
+    perfetto_cmd="ssh ${dut} adb shell perfetto"
+  else
+    perfetto_cmd="ssh ${dut} perfetto"
+  fi
+fi
+
+# Perfetto added --version arg recently, which prints (eg):
+#   "Perfetto v24.2-7cb228c16 (7cb228c16d69aee297a106ad3ccc7461fa0b8045)"
+# Previous versions dump an error (hence 2>/dev/null below).
+perfetto_version=$(${perfetto_cmd} --version 2>/dev/null)
+perfetto_version_major="${perfetto_version#*v}"
+perfetto_version_major="${perfetto_version_major%.*}"
+
 # Write perfetto config file
 
 cat >"${config_filepath}" <<EOL
@@ -213,8 +229,15 @@
   config {
     name: "linux.sys_stats"
     sys_stats_config {
-      cpufreq_period_ms: 1000
+EOL
 
+if [[ ( "${perfetto_version_major}" -ge 24 ) ]]; then
+cat >>"${config_filepath}" <<EOL
+      cpufreq_period_ms: 1000
+EOL
+fi
+
+cat >>"${config_filepath}" <<EOL
       meminfo_period_ms: 1000
       meminfo_counters: MEMINFO_MEM_TOTAL
       meminfo_counters: MEMINFO_MEM_FREE