diff options
| author | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-02-17 23:15:14 -0500 |
|---|---|---|
| committer | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-02-17 23:15:14 -0500 |
| commit | 40900d91ba67ab445fcec3446de04275b52743f3 (patch) | |
| tree | eec51319436ae3cccbbe7c105968c7f9196db912 /src | |
| parent | e7ed8088b5b01c7a9d27ff01b827b723f51bdd9c (diff) | |
Fix issue with missing CPU...
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/data_harvester/cpu.rs | 8 | ||||
| -rw-r--r-- | src/data_conversion.rs | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/app/data_harvester/cpu.rs b/src/app/data_harvester/cpu.rs index 8f45e191..c1f2dee2 100644 --- a/src/app/data_harvester/cpu.rs +++ b/src/app/data_harvester/cpu.rs @@ -10,11 +10,15 @@ pub type CPUHarvest = Vec<CPUData>; pub fn get_cpu_data_list(sys: &System) -> CPUHarvest { let cpu_data = sys.get_processors(); - let mut cpu_vec = Vec::new(); + let avg_cpu_usage = sys.get_global_processor_info().get_cpu_usage(); + let mut cpu_vec = vec![CPUData { + cpu_name: "AVG".to_string(), + cpu_usage: avg_cpu_usage as f64, + }]; for cpu in cpu_data { cpu_vec.push(CPUData { - cpu_name: cpu.get_name().to_string(), + cpu_name: cpu.get_name().to_uppercase(), cpu_usage: f64::from(cpu.get_cpu_usage()), }); } diff --git a/src/data_conversion.rs b/src/data_conversion.rs index 26cbd9c1..bbd51ee5 100644 --- a/src/data_conversion.rs +++ b/src/data_conversion.rs @@ -120,11 +120,8 @@ pub fn convert_cpu_data_points( let itx_offset = itx - cpu_listing_offset; if cpu_data_vector.len() <= itx_offset { cpu_data_vector.push(ConvertedCpuData::default()); - cpu_data_vector[itx_offset].cpu_name = if show_avg_cpu && itx_offset == 0 { - "AVG".to_string() - } else { - current_data.cpu_harvest[itx].cpu_name.to_uppercase() - }; + cpu_data_vector[itx_offset].cpu_name = + current_data.cpu_harvest[itx].cpu_name.clone(); } //Insert joiner points |