X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=opt%2Fdlmalloc%2Fdlmalloc.h;h=b79a83e24bd1d517b32634dad097490524030ef2;hp=c846557b6a929d3112cbdd98c5bd3074bd4fb207;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=29387e76cd5cd340fe7d811dc9830931d3d0ec9b diff --git a/opt/dlmalloc/dlmalloc.h b/opt/dlmalloc/dlmalloc.h index c846557..b79a83e 100644 --- a/opt/dlmalloc/dlmalloc.h +++ b/opt/dlmalloc/dlmalloc.h @@ -1,6 +1,6 @@ -#include <_PDCLIB_aux.h> -#include <_PDCLIB_config.h> -#include <_PDCLIB_glue.h> +#include "_PDCLIB_aux.h" +#include "_PDCLIB_config.h" +#include "_PDCLIB_glue.h" #include typedef mtx_t MLOCK_T; @@ -18,7 +18,13 @@ static void init_malloc_global_mutex(void) mtx_init(&malloc_global_mutex, mtx_plain); } -#define MMAP(s) _PDCLIB_allocpages((s)/_PDCLIB_MALLOC_PAGESIZE) +static inline void *MMAP( size_t nbytes ) +{ + void *p = _PDCLIB_allocpages( nbytes / _PDCLIB_MALLOC_PAGESIZE ); + return p ? p : (void*) (~(size_t)0); +} + +#define MMAP(s) MMAP(s) #define DIRECT_MMAP(s) MMAP(s) #define MUNMAP(a, s) ((_PDCLIB_freepages((a), (s)/_PDCLIB_MALLOC_PAGESIZE)), 0) #define MREMAP(a, osz, nsz, mv) _PDCLIB_reallocpages((a), (osz)/_PDCLIB_MALLOC_PAGESIZE, (nsz)/_PDCLIB_MALLOC_PAGESIZE, (mv)) @@ -67,7 +73,7 @@ static void init_malloc_global_mutex(void) #define MAX_RELEASE_CHECK_RATE _PDCLIB_MALLOC_RELEASE_CHECK_RATE /* C standard says this is so */ -#define REALLOC_ZERO_BYTES_FREES 1 +#define REALLOC_ZERO_BYTES_FREES 1 #define LACKS_UNISTD_H #define LACKS_FCNTL_H #define LACKS_SYS_PARAM_H