diff options
| author | Christopher Ferris <cferris@google.com> | 2016-12-08 11:56:18 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2016-12-12 11:27:08 -0800 |
| commit | bf9b0180f3e75b710d1f419fff343885ee1b3880 (patch) | |
| tree | d6d90045696788a36c0166add55a8399cb6accc4 /include/jemalloc/jemalloc.h | |
| parent | b5d0373650f3274c28b4355533e70ae3e745f039 (diff) | |
| parent | f1f76357313e7dcad7262f17a48ff0a2e005fcdc (diff) | |
| download | jemalloc-bf9b0180f3e75b710d1f419fff343885ee1b3880.tar.gz | |
Update to jemalloc 4.4.0.
Merge remote-tracking branch 'aosp/upstream-new' into upgrade
Includes regenerating the necessary files.
Bug: 33321361
Test: Built for x86_64/arm64. Built the no tcache and tcache enabled
Test: configs (nexus 9/nexus 6p). Compared the before after running
Test: all dumps through the memory replay and verified no unexpected
Test: increases. Ran bionic unit tests in both configs, 32 bit and 64 bit
Test: variants. Ran the jemalloc unit tests in both configs.
Change-Id: I2e8f3305cd1717c7efced69718fff90797f21068
Diffstat (limited to 'include/jemalloc/jemalloc.h')
| -rw-r--r-- | include/jemalloc/jemalloc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/jemalloc/jemalloc.h b/include/jemalloc/jemalloc.h index 7706510..bbd3ca5 100644 --- a/include/jemalloc/jemalloc.h +++ b/include/jemalloc/jemalloc.h @@ -24,7 +24,7 @@ extern "C" { */ #define JEMALLOC_OVERRIDE_MEMALIGN #ifndef __LP64__ -#define JEMALLOC_OVERRIDE_VALLOC +#define JEMALLOC_OVERRIDE_VALLOC #endif /* @@ -41,7 +41,7 @@ extern "C" { * with C++. The only justification for this is to match the prototypes that * glibc defines. */ -/* #undef JEMALLOC_USE_CXX_THROW */ +/* #undef JEMALLOC_USE_CXX_THROW */ #ifdef _MSC_VER # ifdef _WIN64 @@ -94,12 +94,12 @@ extern "C" { #include <limits.h> #include <strings.h> -#define JEMALLOC_VERSION "4.3.1-0-g0110fa8451af905affd77c3bea0d545fee2251b2" +#define JEMALLOC_VERSION "4.4.0-0-gf1f76357313e7dcad7262f17a48ff0a2e005fcdc" #define JEMALLOC_VERSION_MAJOR 4 -#define JEMALLOC_VERSION_MINOR 3 -#define JEMALLOC_VERSION_BUGFIX 1 +#define JEMALLOC_VERSION_MINOR 4 +#define JEMALLOC_VERSION_BUGFIX 0 #define JEMALLOC_VERSION_NREV 0 -#define JEMALLOC_VERSION_GID "0110fa8451af905affd77c3bea0d545fee2251b2" +#define JEMALLOC_VERSION_GID "f1f76357313e7dcad7262f17a48ff0a2e005fcdc" # define MALLOCX_LG_ALIGN(la) ((int)(la)) # if LG_SIZEOF_PTR == 2 |