From 1a4a261db61e3b9199261a9bc62dfa00507d8f38 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Sun, 15 Sep 2019 14:16:18 -0400 Subject: Added scrolling event, need to implement across processes now. --- src/app/data_collection/processes.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/app') diff --git a/src/app/data_collection/processes.rs b/src/app/data_collection/processes.rs index 3f8512e0..e688b560 100644 --- a/src/app/data_collection/processes.rs +++ b/src/app/data_collection/processes.rs @@ -4,7 +4,6 @@ use heim_common::{ }; use std::{collections::HashMap, process::Command}; -#[allow(dead_code)] #[derive(Clone)] pub enum ProcessSorting { CPU, @@ -37,6 +36,9 @@ fn vangelis_cpu_usage_calculation(prev_idle : &mut f64, prev_non_idle : &mut f64 let stat_results = std::fs::read_to_string(path)?; let first_line = stat_results.split('\n').collect::>()[0]; + + // TODO: Consider grabbing by number of threads instead, and summing the total? + // ie: 4 threads, so: (prev - curr) / cpu_0 + ... + (prev - curr) / cpu_n instead? This might be how top does it? let val = first_line.split_whitespace().collect::>(); // SC in case that the parsing will fail due to length: @@ -167,7 +169,9 @@ fn convert_ps(process : &str, cpu_usage_percentage : f64, prev_pid_stats : &mut }) } -pub async fn get_sorted_processes_list(prev_idle : &mut f64, prev_non_idle : &mut f64, prev_pid_stats : &mut HashMap) -> Result, heim::Error> { +pub async fn get_sorted_processes_list( + prev_idle : &mut f64, prev_non_idle : &mut f64, prev_pid_stats : &mut std::collections::HashMap, +) -> Result, heim::Error> { let mut process_vector : Vec = Vec::new(); if cfg!(target_os = "linux") { -- cgit v1.2.3