Skip to content

vmstat: fix meminfo unit #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Krysztal112233 merged 2 commits into from
Apr 13, 2026
Merged

vmstat: fix meminfo unit #668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
537edf5
vmstat: fix meminfo unit
Bluemangoo Apr 9, 2026
251f9b3
Merge branch 'main' into fix/vmstat-meminfo
Krysztal112233 Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions src/uu/vmstat/src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
Expand All @@ -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)
}
}

Expand Down
Loading