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

fix wrong unit being used for memory in sysinfo data (#824)

Browse Source 
* fix wrong unit being used for memory in sysinfo data

* update sysinfo to 0.26.4 for unsupported reasons w/ ntapi
This commit is contained in:
Clement Tsang 2022-10-07 19:15:11 -04:00 committed by GitHub
parent f44aac189c
commit a965e53c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Cargo.lock generated
View File

@ -775,7 +775,7 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"mach", "mach",
"ntapi", "ntapi 0.3.7",
"smol", "smol",
"winapi", "winapi",
] ]
@ -1000,7 +1000,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"miow", "miow",
"ntapi", "ntapi 0.3.7",
"winapi", "winapi",
] ]
@ -1064,6 +1064,15 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "ntapi"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "num-integer" name = "num-integer"
version = "0.1.44" version = "0.1.44"
@ -1536,14 +1545,14 @@ dependencies = [
[[package]] [[package]]
name = "sysinfo" name = "sysinfo"
version = "0.26.2" version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae2421f3e16b3afd4aa692d23b83d0ba42ee9b0081d5deeb7d21428d7195fb1" checksum = "7890fff842b8db56f2033ebee8f6efe1921475c3830c115995552914fb967580"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"core-foundation-sys 0.8.3", "core-foundation-sys 0.8.3",
"libc", "libc",
"ntapi", "ntapi 0.4.0",
"once_cell", "once_cell",
"rayon", "rayon",
"winapi", "winapi",

2
Cargo.toml
View File

@ -74,7 +74,7 @@ once_cell = "1.5.2"
regex = "1.5.5" regex = "1.5.5"
serde = { version = "1.0.136", features = ["derive"] } serde = { version = "1.0.136", features = ["derive"] }
starship-battery = { version = "0.7.9", optional = true } starship-battery = { version = "0.7.9", optional = true }
sysinfo = "0.26.2" sysinfo = "0.26.4"
thiserror = "1.0.30" thiserror = "1.0.30"
time = { version = "0.3.9", features = ["formatting", "macros"] } time = { version = "0.3.9", features = ["formatting", "macros"] }
toml = "0.5.9" toml = "0.5.9"

4
src/app/data_harvester/memory/general/sysinfo.rs
View File

@ -20,7 +20,7 @@ pub async fn get_mem_data(
} }
pub async fn get_ram_data(sys: &System) -> crate::utils::error::Result<Option<MemHarvest>> { pub async fn get_ram_data(sys: &System) -> crate::utils::error::Result<Option<MemHarvest>> {
let (mem_total_in_kib, mem_used_in_kib) = (sys.total_memory(), sys.used_memory()); let (mem_total_in_kib, mem_used_in_kib) = (sys.total_memory() / 1024, sys.used_memory()) / 1024;
Ok(Some(MemHarvest { Ok(Some(MemHarvest {
mem_total_in_kib, mem_total_in_kib,
@ -34,7 +34,7 @@ pub async fn get_ram_data(sys: &System) -> crate::utils::error::Result<Option<Me
} }
pub async fn get_swap_data(sys: &System) -> crate::utils::error::Result<Option<MemHarvest>> { pub async fn get_swap_data(sys: &System) -> crate::utils::error::Result<Option<MemHarvest>> {
let (mem_total_in_kib, mem_used_in_kib) = (sys.total_swap(), sys.used_swap()); let (mem_total_in_kib, mem_used_in_kib) = (sys.total_swap() / 1024, sys.used_swap() / 1024);
Ok(Some(MemHarvest { Ok(Some(MemHarvest {
mem_total_in_kib, mem_total_in_kib,

2
src/app/data_harvester/processes/macos_freebsd.rs
View File

@ -76,7 +76,7 @@ pub fn get_process_data(
} else { } else {
0.0 0.0
}, },
mem_usage_bytes: process_val.memory() * 1024, mem_usage_bytes: process_val.memory(),
cpu_usage_percent: process_cpu_usage, cpu_usage_percent: process_cpu_usage,
read_bytes_per_sec: disk_usage.read_bytes, read_bytes_per_sec: disk_usage.read_bytes,
write_bytes_per_sec: disk_usage.written_bytes, write_bytes_per_sec: disk_usage.written_bytes,

2
src/app/data_harvester/processes/windows.rs
View File

@ -66,7 +66,7 @@ pub fn get_process_data(
} else { } else {
0.0 0.0
}, },
mem_usage_bytes: process_val.memory() * 1024, mem_usage_bytes: process_val.memory(),
cpu_usage_percent: process_cpu_usage, cpu_usage_percent: process_cpu_usage,
read_bytes_per_sec: disk_usage.read_bytes, read_bytes_per_sec: disk_usage.read_bytes,
write_bytes_per_sec: disk_usage.written_bytes, write_bytes_per_sec: disk_usage.written_bytes,