Skip to content

Commit 9d6d76a

Browse files
committed
Auto merge of #2374 - devnexen:linux_malloc_info, r=Amanieu
linux glibc and android adding malloc_info fn.
2 parents 013ab57 + 81d4b04 commit 9d6d76a

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

libc-test/semver/linux-gnu.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ globfree
548548
globfree64
549549
mallinfo
550550
mallinfo2
551+
malloc_info
551552
malloc_usable_size
552553
mallopt
553554
nl_mmap_hdr

src/unix/linux_like/android/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2570,6 +2570,9 @@ extern "C" {
25702570
pub fn __sched_cpucount(setsize: ::size_t, set: *const cpu_set_t) -> ::c_int;
25712571
pub fn sched_getcpu() -> ::c_int;
25722572
pub fn mallinfo() -> ::mallinfo;
2573+
// available from API 23
2574+
pub fn malloc_info(options: ::c_int, stream: *mut ::FILE) -> ::c_int;
2575+
25732576
pub fn malloc_usable_size(ptr: *const ::c_void) -> ::size_t;
25742577

25752578
pub fn utmpname(name: *const ::c_char) -> ::c_int;

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,6 +1326,7 @@ extern "C" {
13261326
pub fn sched_getcpu() -> ::c_int;
13271327
pub fn mallinfo() -> ::mallinfo;
13281328
pub fn mallinfo2() -> ::mallinfo2;
1329+
pub fn malloc_info(options: ::c_int, stream: *mut ::FILE) -> ::c_int;
13291330
pub fn malloc_usable_size(ptr: *mut ::c_void) -> ::size_t;
13301331
pub fn getpwent_r(
13311332
pwd: *mut ::passwd,

0 commit comments

Comments
 (0)