uutils/procps
0
0
Fork 0
mirror of https://github.com/uutils/procps.git synced 2026-06-10 16:14:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #668 from Bluemangoo/fix/vmstat-meminfo

Browse Source 
vmstat: fix meminfo unit
This commit is contained in:
Krysztal Huang
2026-04-13 11:06:38 +08:00
committed by GitHub
parent 75e5833ad7 251f9b31ed
commit 46b2b1be38
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/vmstat/src/parser.rs
+30 -12
View File
@@ -211,6 +211,16 @@ pub struct Meminfo {
pub swap_total: bytesize::ByteSize,
pub swap_free: bytesize::ByteSize,
}
#[cfg(target_os = "linux")]
fn kb_to_kib(mut size: bytesize::ByteSize) -> bytesize::ByteSize {
// "kB" means KiB instead of KB
// Convert from 1000-based(parsed by bytesize from "kB" ended string) to 1024-based(which it actually is)
// See more at https://github.com/uutils/procps/issues/667
size.0 = size.0 / 1000 * 1024;
size
}
#[cfg(target_os = "linux")]
impl Meminfo {
pub fn current() -> Self {
@@ -221,20 +231,28 @@ impl Meminfo {
pub fn from_proc_map(proc_map: &HashMap<String, String>) -> Self {
use std::str::FromStr;
let mem_total = bytesize::ByteSize::from_str(proc_map.get("MemTotal").unwrap()).unwrap();
let mem_free = bytesize::ByteSize::from_str(proc_map.get("MemFree").unwrap()).unwrap();
let mem_total =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("MemTotal").unwrap()).unwrap());
let mem_free =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("MemFree").unwrap()).unwrap());
let mem_available =
bytesize::ByteSize::from_str(proc_map.get("MemAvailable").unwrap()).unwrap();
let buffers = bytesize::ByteSize::from_str(proc_map.get("Buffers").unwrap()).unwrap();
let cached = bytesize::ByteSize::from_str(proc_map.get("Cached").unwrap()).unwrap();
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("MemAvailable").unwrap()).unwrap());
let buffers =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Buffers").unwrap()).unwrap());
let cached =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Cached").unwrap()).unwrap());
let s_reclaimable =
bytesize::ByteSize::from_str(proc_map.get("SReclaimable").unwrap()).unwrap();
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SReclaimable").unwrap()).unwrap());
let swap_cached =
bytesize::ByteSize::from_str(proc_map.get("SwapCached").unwrap()).unwrap();
let active = bytesize::ByteSize::from_str(proc_map.get("Active").unwrap()).unwrap();
let inactive = bytesize::ByteSize::from_str(proc_map.get("Inactive").unwrap()).unwrap();
let swap_total = bytesize::ByteSize::from_str(proc_map.get("SwapTotal").unwrap()).unwrap();
let swap_free = bytesize::ByteSize::from_str(proc_map.get("SwapFree").unwrap()).unwrap();
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SwapCached").unwrap()).unwrap());
let active =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Active").unwrap()).unwrap());
let inactive =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("Inactive").unwrap()).unwrap());
let swap_total =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SwapTotal").unwrap()).unwrap());
let swap_free =
kb_to_kib(bytesize::ByteSize::from_str(proc_map.get("SwapFree").unwrap()).unwrap());
Self {
mem_total,
mem_free,
@@ -258,7 +276,7 @@ pub struct DiskStatParseError;
#[cfg(target_os = "linux")]
impl Display for DiskStatParseError {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
std::fmt::Debug::fmt("Failed to parse diskstat line", f)
Debug::fmt("Failed to parse diskstat line", f)
}
}