Add support for mallinfo2 on glibc Linux

This commit is contained in:
Jonas Schievink 2021-06-10 14:58:52 +02:00
parent f4da4de7cd
commit 35b18b2725

View file

@ -32,9 +32,7 @@ impl MemoryUsage {
allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap() as isize), allocated: Bytes(jemalloc_ctl::stats::allocated::read().unwrap() as isize),
} }
} else if #[cfg(all(target_os = "linux", target_env = "gnu"))] { } else if #[cfg(all(target_os = "linux", target_env = "gnu"))] {
// Note: This is incredibly slow. memusage_linux()
let alloc = unsafe { libc::mallinfo() }.uordblks as isize;
MemoryUsage { allocated: Bytes(alloc) }
} else if #[cfg(windows)] { } else if #[cfg(windows)] {
// There doesn't seem to be an API for determining heap usage, so we try to // There doesn't seem to be an API for determining heap usage, so we try to
// approximate that by using the Commit Charge value. // approximate that by using the Commit Charge value.
@ -58,6 +56,37 @@ impl MemoryUsage {
} }
} }
#[cfg(all(target_os = "linux", target_env = "gnu"))]
fn memusage_linux() -> MemoryUsage {
// Linux/glibc has 2 APIs for allocator introspection that we can use: mallinfo and mallinfo2.
// mallinfo uses `int` fields and cannot handle memory usage exceeding 2 GB.
// mallinfo2 is very recent, so its presence needs to be detected at runtime.
// Both are abysmally slow.
use std::ffi::CStr;
use std::sync::atomic::{AtomicUsize, Ordering};
static MALLINFO2: AtomicUsize = AtomicUsize::new(1);
let mut mallinfo2 = MALLINFO2.load(Ordering::Relaxed);
if mallinfo2 == 1 {
let cstr = CStr::from_bytes_with_nul(b"mallinfo2\0").unwrap();
mallinfo2 = unsafe { libc::dlsym(libc::RTLD_DEFAULT, cstr.as_ptr()) } as usize;
// NB: races don't matter here, since they'll always store the same value
MALLINFO2.store(mallinfo2, Ordering::Relaxed);
}
if mallinfo2 == 0 {
// mallinfo2 does not exist, use mallinfo.
let alloc = unsafe { libc::mallinfo() }.uordblks as isize;
MemoryUsage { allocated: Bytes(alloc) }
} else {
let mallinfo2: fn() -> libc::mallinfo2 = unsafe { std::mem::transmute(mallinfo2) };
let alloc = mallinfo2().uordblks as isize;
MemoryUsage { allocated: Bytes(alloc) }
}
}
#[derive(Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)] #[derive(Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
pub struct Bytes(isize); pub struct Bytes(isize);