ClementTsang/bottom
1
1
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2024-09-19 15:37:27 +03:00
Code Issues Projects Releases Wiki Activity

Update heim

Browse Source
This commit is contained in:
ClementTsang 2019-12-25 20:28:38 -05:00
parent b7a7ae1a17
commit 395a3083c6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -20,9 +20,9 @@ clap = "2.33.0"
crossterm = "0.14"
failure = "0.1.6"
fern = "0.5"
futures-timer = "0.3"
futures-preview = "0.3.0-alpha.18"
heim = "0.0.8"
futures-timer = "2.0.2"
futures = "0.3.1"
heim = "0.0.9"
log = "0.4"
rayon = "1.3"
regex = "1.3.1"

2
src/app/data_collection/disks.rs
View File

@ -1,4 +1,4 @@
use futures::StreamExt;
use futures::stream::StreamExt;
use heim::units::information;
use std::time::Instant;

8
src/app/data_collection/processes.rs
View File

@ -26,8 +26,8 @@ pub struct ProcessData {
pub command: String,
}
fn vangelis_cpu_usage_calculation(prev_idle: &mut f64, prev_non_idle: &mut f64) -> std::io::Result<(f64, f64)> {
// Named after this SO answer: https://stackoverflow.com/a/23376195
fn cpu_usage_calculation(prev_idle: &mut f64, prev_non_idle: &mut f64) -> std::io::Result<(f64, f64)> {
// From SO answer: https://stackoverflow.com/a/23376195
let mut path = std::path::PathBuf::new();
path.push("/proc");
path.push("stat");
@ -36,7 +36,7 @@ fn vangelis_cpu_usage_calculation(prev_idle: &mut f64, prev_non_idle: &mut f64)
let first_line = stat_results.split('\n').collect::<Vec<&str>>()[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?
// ie: 4 threads, so: (prev - cur) / cpu_0 + ... + (prev - cur) / cpu_n instead? This might be how top does it?
let val = first_line.split_whitespace().collect::<Vec<&str>>();
// SC in case that the parsing will fail due to length:
@ -179,7 +179,7 @@ pub async fn get_sorted_processes_list(
let ps_result = Command::new("ps").args(&["-axo", "pid:10,comm:50,%mem:5", "--noheader"]).output()?;
let ps_stdout = String::from_utf8_lossy(&ps_result.stdout);
let split_string = ps_stdout.split('\n');
if let Ok((cpu_usage, cpu_percentage)) = vangelis_cpu_usage_calculation(prev_idle, prev_non_idle) {
if let Ok((cpu_usage, cpu_percentage)) = cpu_usage_calculation(prev_idle, prev_non_idle) {
let process_stream = split_string.collect::<Vec<&str>>();
for process in process_stream {