From b12c5b651458ad19df6a8e500bb5367d144eb2d5 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Thu, 24 Mar 2022 19:28:07 -0700
Subject: [PATCH 1/2] test onroad: CPU usage test improvements

---
 selfdrive/test/test_onroad.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py
index 80a381d3fc8030..001cac53e1cdf1 100755
--- a/selfdrive/test/test_onroad.py
+++ b/selfdrive/test/test_onroad.py
@@ -56,7 +56,7 @@
   PROCS.update({
     "./loggerd": 70.0,
     "selfdrive.controls.controlsd": 31.0,
-    "./camerad": 36.8,
+    "./camerad": 41.0,
     "./_ui": 33.0,
     "selfdrive.controls.plannerd": 11.7,
     "./_dmonitoringmodeld": 10.0,
@@ -106,6 +106,7 @@ def check_cpu_usage(first_proc, last_proc):
   r = True
   dt = (last_proc.logMonoTime - first_proc.logMonoTime) / 1e9
   for proc_name, normal_cpu_usage in PROCS.items():
+    err = ""
     first, last = None, None
     try:
       first = [p for p in first_proc.procLog.procs if proc_name in p.cmdline][0]
@@ -115,15 +116,18 @@ def check_cpu_usage(first_proc, last_proc):
       if cpu_usage > max(normal_cpu_usage * 1.15, normal_cpu_usage + 5.0):
         # cpu usage is high while playing sounds
         if not (proc_name == "./_soundd" and cpu_usage < 65.):
-          result += f"Warning {proc_name} using more CPU than normal\n"
-          r = False
+          err = "using more CPU than normal"
       elif cpu_usage < min(normal_cpu_usage * 0.65, max(normal_cpu_usage - 1.0, 0.0)):
+        err = "using less CPU than normal"
         result += f"Warning {proc_name} using less CPU than normal\n"
-        r = False
       result += f"{proc_name.ljust(35)}  {cpu_usage:.2f}%\n"
     except IndexError:
-      result += f"{proc_name.ljust(35)}  NO METRICS FOUND {first=} {last=}\n"
+      err = f"NO METRICS FOUND {first=} {last=}\n"
+
+    result += f"{proc_name.ljust(35)}  {cpu_usage:5.2f}% ({normal_cpu_usage:5.2f}%) {err}\n"
+    if len(err) > 0:
       r = False
+
   result += "------------------------------------------------\n"
   print(result)
   return r

From 95adc1026505a2e9dc65870dbdd5cd102423e579 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Thu, 24 Mar 2022 19:38:53 -0700
Subject: [PATCH 2/2] remove those

---
 selfdrive/test/test_onroad.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/selfdrive/test/test_onroad.py b/selfdrive/test/test_onroad.py
index 001cac53e1cdf1..f1f540dad1aa12 100755
--- a/selfdrive/test/test_onroad.py
+++ b/selfdrive/test/test_onroad.py
@@ -119,8 +119,6 @@ def check_cpu_usage(first_proc, last_proc):
           err = "using more CPU than normal"
       elif cpu_usage < min(normal_cpu_usage * 0.65, max(normal_cpu_usage - 1.0, 0.0)):
         err = "using less CPU than normal"
-        result += f"Warning {proc_name} using less CPU than normal\n"
-      result += f"{proc_name.ljust(35)}  {cpu_usage:.2f}%\n"
     except IndexError:
       err = f"NO METRICS FOUND {first=} {last=}\n"