pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added % used ram to EWW_RAM

Browse source
This commit is contained in:
druskus20 2021-08-24 13:39:04 +02:00
parent 5ca6ba03c4
commit 905118f612
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/eww/src/config/system_stats.rs
View file

@ -34,14 +34,18 @@ pub fn get_disks() -> String {
pub fn get_ram() -> String { pub fn get_ram() -> String {
let mut c = SYSTEM.lock().unwrap(); let mut c = SYSTEM.lock().unwrap();
c.refresh_memory(); c.refresh_memory();
let total_memory = c.get_total_memory();
let used_memory = c.get_used_memory();
format!( format!(
r#"{{"total_mem": {}, "free_mem": {}, "total_swap": {}, "free_swap": {}, "available_mem": {}, "used_mem": {}}}"#, r#"{{"total_mem": {}, "free_mem": {}, "total_swap": {}, "free_swap": {}, "available_mem": {}, "used_mem": {}, "used_mem_perc": {}}}"#,
c.get_total_memory(), total_memory,
c.get_free_memory(), c.get_free_memory(),
c.get_total_swap(), c.get_total_swap(),
c.get_free_swap(), c.get_free_swap(),
c.get_available_memory(), c.get_available_memory(),
c.get_used_memory(), used_memory,
used_memory / total_memory,
) )
} }
@ -66,7 +70,12 @@ pub fn get_cpus() -> String {
r#"{{ "cores": [{}], "avg": {} }}"#, r#"{{ "cores": [{}], "avg": {} }}"#,
processors processors
.iter() .iter()
.map(|a| format!(r#"{{"core": "{}", "freq": {}, "usage": {}}}"#, a.get_name(), a.get_frequency(), a.get_cpu_usage())) .map(|a| format!(
r#"{{"core": "{}", "freq": {}, "usage": {:.0}}}"#,
a.get_name(),
a.get_frequency(),
a.get_cpu_usage()
))
.join(","), .join(","),
processors.iter().map(|a| a.get_cpu_usage()).avg() processors.iter().map(|a| a.get_cpu_usage()).avg()
) )