tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-27 15:44:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

New way of doing referencing previous pid stats without having to GC - just write a new one every time...

Browse Source
This commit is contained in:
ClementTsang 2020-01-31 20:49:30 -05:00
parent 4f31c6ee02
commit 971384cf3a
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -80,7 +80,7 @@ Run using `btm`.
- `-g`, `--group` will group together processes with the same name by default (equivalent to pressing `Tab`). - `-g`, `--group` will group together processes with the same name by default (equivalent to pressing `Tab`).
- `-i`, `--case_insensitive` will default to not matching cases when searching processes. - `-i`, `--case_insensitive` will default to not matching case when searching processes.
### Keybindings ### Keybindings

2
src/app/data_farmer.rs
View File

@ -276,7 +276,7 @@ pub fn generate_joining_points(
500, 500,
); );
for itx in (0..num_points).step_by(1) { for itx in 0..num_points {
points.push(( points.push((
time_difference - (itx as f64 / num_points as f64 * time_difference), time_difference - (itx as f64 / num_points as f64 * time_difference),
start_y + (itx as f64 / num_points as f64 * value_difference), start_y + (itx as f64 / num_points as f64 * value_difference),

27
src/app/data_harvester/processes.rs
View File

@ -144,12 +144,13 @@ fn get_process_cpu_stats(pid: u32) -> std::io::Result<f64> {
/// Note that cpu_percentage should be represented WITHOUT the \times 100 factor! /// Note that cpu_percentage should be represented WITHOUT the \times 100 factor!
fn linux_cpu_usage( fn linux_cpu_usage(
pid: u32, cpu_usage: f64, cpu_percentage: f64, pid: u32, cpu_usage: f64, cpu_percentage: f64,
previous_pid_stats: &mut HashMap<String, (f64, Instant)>, use_current_cpu_total: bool, prev_pid_stats: &HashMap<String, (f64, Instant)>,
new_pid_stats: &mut HashMap<String, (f64, Instant)>, use_current_cpu_total: bool,
curr_time: &Instant, curr_time: &Instant,
) -> std::io::Result<f64> { ) -> std::io::Result<f64> {
// Based heavily on https://stackoverflow.com/a/23376195 and https://stackoverflow.com/a/1424556 // Based heavily on https://stackoverflow.com/a/23376195 and https://stackoverflow.com/a/1424556
let before_proc_val: f64 = if previous_pid_stats.contains_key(&pid.to_string()) { let before_proc_val: f64 = if prev_pid_stats.contains_key(&pid.to_string()) {
previous_pid_stats prev_pid_stats
.get(&pid.to_string()) .get(&pid.to_string())
.unwrap_or(&(0_f64, *curr_time)) .unwrap_or(&(0_f64, *curr_time))
.0 .0
@ -167,10 +168,7 @@ fn linux_cpu_usage(
(after_proc_val - before_proc_val) / cpu_usage * 100_f64 (after_proc_val - before_proc_val) / cpu_usage * 100_f64
);*/ );*/
let entry = previous_pid_stats new_pid_stats.insert(pid.to_string(), (after_proc_val, *curr_time));
.entry(pid.to_string())
.or_insert((after_proc_val, *curr_time));
*entry = (after_proc_val, *curr_time);
if use_current_cpu_total { if use_current_cpu_total {
Ok((after_proc_val - before_proc_val) / cpu_usage * 100_f64) Ok((after_proc_val - before_proc_val) / cpu_usage * 100_f64)
} else { } else {
@ -180,7 +178,8 @@ fn linux_cpu_usage(
fn convert_ps( fn convert_ps(
process: &str, cpu_usage: f64, cpu_percentage: f64, process: &str, cpu_usage: f64, cpu_percentage: f64,
prev_pid_stats: &mut HashMap<String, (f64, Instant)>, use_current_cpu_total: bool, prev_pid_stats: &HashMap<String, (f64, Instant)>,
new_pid_stats: &mut HashMap<String, (f64, Instant)>, use_current_cpu_total: bool,
curr_time: &Instant, curr_time: &Instant,
) -> std::io::Result<ProcessHarvest> { ) -> std::io::Result<ProcessHarvest> {
if process.trim().to_string().is_empty() { if process.trim().to_string().is_empty() {
@ -214,6 +213,7 @@ fn convert_ps(
cpu_usage, cpu_usage,
cpu_percentage, cpu_percentage,
prev_pid_stats, prev_pid_stats,
new_pid_stats,
use_current_cpu_total, use_current_cpu_total,
curr_time, curr_time,
)?, )?,
@ -223,8 +223,8 @@ fn convert_ps(
pub fn get_sorted_processes_list( pub fn get_sorted_processes_list(
sys: &System, prev_idle: &mut f64, prev_non_idle: &mut f64, sys: &System, prev_idle: &mut f64, prev_non_idle: &mut f64,
prev_pid_stats: &mut std::collections::HashMap<String, (f64, Instant)>, prev_pid_stats: &mut HashMap<String, (f64, Instant)>, use_current_cpu_total: bool,
use_current_cpu_total: bool, mem_total_kb: u64, curr_time: &Instant, mem_total_kb: u64, curr_time: &Instant,
) -> crate::utils::error::Result<Vec<ProcessHarvest>> { ) -> crate::utils::error::Result<Vec<ProcessHarvest>> {
let mut process_vector: Vec<ProcessHarvest> = Vec::new(); let mut process_vector: Vec<ProcessHarvest> = Vec::new();
@ -240,12 +240,15 @@ pub fn get_sorted_processes_list(
if let Ok((cpu_usage, cpu_percentage)) = cpu_calc { if let Ok((cpu_usage, cpu_percentage)) = cpu_calc {
let process_stream = split_string.collect::<Vec<&str>>(); let process_stream = split_string.collect::<Vec<&str>>();
let mut new_pid_stats: HashMap<String, (f64, Instant)> = HashMap::new();
for process in process_stream { for process in process_stream {
if let Ok(process_object) = convert_ps( if let Ok(process_object) = convert_ps(
process, process,
cpu_usage, cpu_usage,
cpu_percentage, cpu_percentage,
prev_pid_stats, &prev_pid_stats,
&mut new_pid_stats,
use_current_cpu_total, use_current_cpu_total,
curr_time, curr_time,
) { ) {
@ -254,6 +257,8 @@ pub fn get_sorted_processes_list(
} }
} }
} }
*prev_pid_stats = new_pid_stats;
} else { } else {
error!("Unable to properly parse CPU data in Linux."); error!("Unable to properly parse CPU data in Linux.");
error!("Result: {:?}", cpu_calc.err()); error!("Result: {:?}", cpu_calc.err());