diff options
Diffstat (limited to 'include/jemalloc/jemalloc.h')
| -rw-r--r-- | include/jemalloc/jemalloc.h | 47 |
1 files changed, 41 insertions, 6 deletions
diff --git a/include/jemalloc/jemalloc.h b/include/jemalloc/jemalloc.h index c0d12d2f..2df0ad69 100644 --- a/include/jemalloc/jemalloc.h +++ b/include/jemalloc/jemalloc.h @@ -10,6 +10,9 @@ extern "C" { /* Defined if alloc_size attribute is supported. */ #define JEMALLOC_HAVE_ATTR_ALLOC_SIZE +/* Defined if format_arg(...) attribute is supported. */ +#define JEMALLOC_HAVE_ATTR_FORMAT_ARG + /* Defined if format(gnu_printf, ...) attribute is supported. */ /* #undef JEMALLOC_HAVE_ATTR_FORMAT_GNU_PRINTF */ @@ -59,7 +62,30 @@ extern "C" { * --with-jemalloc-prefix. With default settings the je_ prefix is stripped by * these macro definitions. */ -#include "jemalloc_rename.h" +#ifndef JEMALLOC_NO_RENAME +# define je_aligned_alloc je_aligned_alloc +# define je_calloc je_calloc +# define je_dallocx je_dallocx +# define je_free je_free +# define je_mallctl je_mallctl +# define je_mallctlbymib je_mallctlbymib +# define je_mallctlnametomib je_mallctlnametomib +# define je_malloc je_malloc +# define je_malloc_conf je_malloc_conf +# define je_malloc_message je_malloc_message +# define je_malloc_stats_print je_malloc_stats_print +# define je_malloc_usable_size je_malloc_usable_size +# define je_mallocx je_mallocx +# define je_smallocx_8d7998a73dff4dcc27457c15a9110669d2d932b9 je_smallocx_8d7998a73dff4dcc27457c15a9110669d2d932b9 +# define je_nallocx je_nallocx +# define je_posix_memalign je_posix_memalign +# define je_rallocx je_rallocx +# define je_realloc je_realloc +# define je_sallocx je_sallocx +# define je_sdallocx je_sdallocx +# define je_xallocx je_xallocx +# define je_memalign je_memalign +#endif #include <stdlib.h> #include <stdbool.h> @@ -67,12 +93,13 @@ extern "C" { #include <limits.h> #include <strings.h> -#define JEMALLOC_VERSION "5.1.0-0-g61efbda7098de6fe64c362d309824864308c36d4" +#define JEMALLOC_VERSION "5.2.1-110-g8d7998a73dff4dcc27457c15a9110669d2d932b9" #define JEMALLOC_VERSION_MAJOR 5 -#define JEMALLOC_VERSION_MINOR 1 -#define JEMALLOC_VERSION_BUGFIX 0 -#define JEMALLOC_VERSION_NREV 0 -#define JEMALLOC_VERSION_GID "61efbda7098de6fe64c362d309824864308c36d4" +#define JEMALLOC_VERSION_MINOR 2 +#define JEMALLOC_VERSION_BUGFIX 1 +#define JEMALLOC_VERSION_NREV 110 +#define JEMALLOC_VERSION_GID "8d7998a73dff4dcc27457c15a9110669d2d932b9" +#define JEMALLOC_VERSION_GID_IDENT 8d7998a73dff4dcc27457c15a9110669d2d932b9 #define MALLOCX_LG_ALIGN(la) ((int)(la)) #if LG_SIZEOF_PTR == 2 @@ -131,6 +158,7 @@ extern "C" { # define JEMALLOC_EXPORT __declspec(dllimport) # endif # endif +# define JEMALLOC_FORMAT_ARG(i) # define JEMALLOC_FORMAT_PRINTF(s, i) # define JEMALLOC_NOINLINE __declspec(noinline) # ifdef __cplusplus @@ -158,6 +186,11 @@ extern "C" { # ifndef JEMALLOC_EXPORT # define JEMALLOC_EXPORT JEMALLOC_ATTR(visibility("default")) # endif +# ifdef JEMALLOC_HAVE_ATTR_FORMAT_ARG +# define JEMALLOC_FORMAT_ARG(i) JEMALLOC_ATTR(__format_arg__(3)) +# else +# define JEMALLOC_FORMAT_ARG(i) +# endif # ifdef JEMALLOC_HAVE_ATTR_FORMAT_GNU_PRINTF # define JEMALLOC_FORMAT_PRINTF(s, i) JEMALLOC_ATTR(format(gnu_printf, s, i)) # elif defined(JEMALLOC_HAVE_ATTR_FORMAT_PRINTF) @@ -353,6 +386,7 @@ struct extent_hooks_s { # define malloc_stats_print je_malloc_stats_print # define malloc_usable_size je_malloc_usable_size # define mallocx je_mallocx +# define smallocx_8d7998a73dff4dcc27457c15a9110669d2d932b9 je_smallocx_8d7998a73dff4dcc27457c15a9110669d2d932b9 # define nallocx je_nallocx # define posix_memalign je_posix_memalign # define rallocx je_rallocx @@ -385,6 +419,7 @@ struct extent_hooks_s { # undef je_malloc_stats_print # undef je_malloc_usable_size # undef je_mallocx +# undef je_smallocx_8d7998a73dff4dcc27457c15a9110669d2d932b9 # undef je_nallocx # undef je_posix_memalign # undef je_rallocx |