fix(dashboard): switch back to old method of getting CPU usage

It's much more accurate
ravenclaw900 · Nov 6, 2021 · 5f3cc1e · 5f3cc1e
1 parent 279c71a
commit 5f3cc1e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/backend/src/systemdata.rs b/src/backend/src/systemdata.rs
@@ -29,11 +29,15 @@ fn round_percent(unrounded: f64) -> f32 {
 }
 
 pub async fn cpu() -> f32 {
-    let usage1 = cpu::usage().await.unwrap();
+    let times1 = cpu::time().await.unwrap();
+    let used1 = times1.system() + times1.user();
     thread::sleep(time::Duration::from_secs(1));
-    let usage2 = cpu::usage().await.unwrap();
+    let times2 = cpu::time().await.unwrap();
+    let used2 = times2.system() + times2.user();
 
-    round_percent((usage2 - usage1).get::<percent>().min(100.0).into())
+    round_percent(
+        ((used2 - used1) / ((used2 + times2.idle()) - (used1 + times1.idle()))).get::<percent>(),
+    )
 }
 
 #[allow(clippy::cast_precision_loss)]