Auto merge of #2294 - devnexen:fbsd_malloc_api, r=JohnTitor

freebsd add additional allocator api.

Author: bors

libc-test/build.rs

@@ -1728,6 +1728,7 @@ fn test_freebsd(target: &str) {
                 "link.h",
                 "locale.h",
                 "machine/reg.h",
+                "malloc_np.h",
                 "mqueue.h",
                 "net/bpf.h",
                 "net/if.h",

libc-test/semver/freebsd.txt

@@ -645,6 +645,10 @@ MADV_PROTECT
 MADV_RANDOM
 MADV_SEQUENTIAL
 MADV_WILLNEED
+MALLOCX_ARENA
+MALLOCX_ALIGN
+MALLOCX_TCACHE
+MALLOCX_ZERO
 MAP_COPY
 MAP_EXCL
 MAP_FILE
@@ -1361,6 +1365,7 @@ clock_settime
 cmsgcred
 cmsghdr
 daemon
+dallocx
 difftime
 dirfd
 dl_iterate_phdr
@@ -1393,6 +1398,12 @@ fdatasync
 fdopendir
 fexecve
 fflags_t
+ffs
+ffsl
+ffsll
+fls
+flsl
+flsll
 fmemopen
 forkpty
 freeifaddrs
@@ -1464,6 +1475,10 @@ login_tty
 lutimes
 lwpid_t
 madvise
+mallctl
+mallctlbymib
+mallctlnametomib
+mallocx
 memmem
 memrchr
 memset_s
@@ -1496,6 +1511,7 @@ msgqnum_t
 msgrcv
 msgsnd
 msqid_ds
+nallocx
 newlocale
 nice
 nl_item
@@ -1588,6 +1604,7 @@ pututxline
 pwritev
 qsort
 querylocale
+rallocx
 rand
 readdir_r
 readlinkat
@@ -1606,9 +1623,11 @@ regmatch_t
 regoff_t
 rtprio
 rtprio_thread
+sallocx
 sched_getscheduler
 sched_param
 sched_setscheduler
+sdallocx
 seekdir
 sem_close
 sem_destroy
@@ -1675,4 +1694,5 @@ utmpx
 vm_size_t
 wait4
 waitid
+xallocx
 xucred

src/unix/bsd/freebsdlike/freebsd/mod.rs

@@ -1301,6 +1301,8 @@ pub const RFLINUXTHPN: ::c_int = 65536;
 pub const RFTSIGZMB: ::c_int = 524288;
 pub const RFSPAWN: ::c_int = 2147483648;
 
+pub const MALLOCX_ZERO: ::c_int = 0x40;
+
 const_fn! {
     {const} fn _ALIGN(p: usize) -> usize {
         (p + _ALIGNBYTES) & !_ALIGNBYTES
@@ -1340,6 +1342,18 @@ f! {
             as ::c_uint
     }
 
+    pub fn MALLOCX_ALIGN(lg: ::c_uint) -> ::c_int {
+        ffsl(lg as ::c_long - 1)
+    }
+
+    pub {const} fn MALLOCX_TCACHE(tc: ::c_int) -> ::c_int {
+        (tc + 2) << 8 as ::c_int
+    }
+
+    pub {const} fn MALLOCX_ARENA(a: ::c_int) -> ::c_int {
+        (a + 1) << 20 as ::c_int
+    }
+
     pub fn SOCKCREDSIZE(ngrps: usize) -> usize {
         let ngrps = if ngrps > 0 {
             ngrps - 1
@@ -1695,6 +1709,47 @@ extern "C" {
     pub fn cap_rights_contains(big: *const cap_rights_t, little: *const cap_rights_t) -> bool;
 
     pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
+
+    pub fn ffs(value: ::c_int) -> ::c_int;
+    pub fn ffsl(value: ::c_long) -> ::c_int;
+    pub fn ffsll(value: ::c_longlong) -> ::c_int;
+    pub fn fls(value: ::c_int) -> ::c_int;
+    pub fn flsl(value: ::c_long) -> ::c_int;
+    pub fn flsll(value: ::c_longlong) -> ::c_int;
+    pub fn malloc_usable_size(ptr: *const ::c_void) -> ::size_t;
+    pub fn malloc_stats_print(
+        write_cb: unsafe extern "C" fn(*mut ::c_void, *const ::c_char),
+        cbopaque: *mut ::c_void,
+        opt: *const ::c_char,
+    );
+    pub fn mallctl(
+        name: *const ::c_char,
+        oldp: *mut ::c_void,
+        oldlenp: *mut ::size_t,
+        newp: *mut ::c_void,
+        newlen: ::size_t,
+    ) -> ::c_int;
+    pub fn mallctlnametomib(
+        name: *const ::c_char,
+        mibp: *mut ::size_t,
+        miplen: *mut ::size_t,
+    ) -> ::c_int;
+    pub fn mallctlbymib(
+        mib: *const ::size_t,
+        mible: ::size_t,
+        oldp: *mut ::c_void,
+        oldlenp: *mut ::size_t,
+        newp: *mut ::c_void,
+        newlen: ::size_t,
+    ) -> ::c_int;
+    pub fn mallocx(size: ::size_t, flags: ::c_int) -> *mut ::c_void;
+    pub fn rallocx(ptr: *mut ::c_void, size: ::size_t, flags: ::c_int) -> *mut ::c_void;
+    pub fn xallocx(ptr: *mut ::c_void, size: ::size_t, extra: ::size_t, flags: ::c_int)
+        -> ::size_t;
+    pub fn sallocx(ptr: *const ::c_void, flags: ::c_int) -> ::size_t;
+    pub fn dallocx(ptr: *mut ::c_void, flags: ::c_int);
+    pub fn sdallocx(ptr: *mut ::c_void, size: ::size_t, flags: ::c_int);
+    pub fn nallocx(size: ::size_t, flags: ::c_int) -> ::size_t;
 }
 
 #[link(name = "util")]