diff options
| author | Christopher Ferris <cferris@google.com> | 2015-05-20 15:08:31 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-05-21 10:11:57 -0700 |
| commit | cb4217087d4d5b1271f8316515f5e71f087b3162 (patch) | |
| tree | 6098a1a926d2945e42da5236e321ce97eab68f93 /include/jemalloc/internal | |
| parent | 83d543f8689bc7c6142179a5491bdf2a31b5cfc7 (diff) | |
| download | jemalloc-cb4217087d4d5b1271f8316515f5e71f087b3162.tar.gz | |
Update headers to match .in changes.android-m-preview
jemalloc_internal.h.in and jemalloc_internal_defs.h.in have been
updated. This change updates the corresponding files to include the
new changes.
Bug: 21326736
Change-Id: Ie2aaeb88131c5fc23b0ad374ee93bd49e14eafa0
Diffstat (limited to 'include/jemalloc/internal')
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal.h | 9 | ||||
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal_defs.h | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal.h b/include/jemalloc/internal/jemalloc_internal.h index d907869..9706682 100644 --- a/include/jemalloc/internal/jemalloc_internal.h +++ b/include/jemalloc/internal/jemalloc_internal.h @@ -126,6 +126,13 @@ static const bool config_ivsalloc = false #endif ; +static const bool config_cache_oblivious = +#ifdef JEMALLOC_CACHE_OBLIVIOUS + true +#else + false +#endif + ; #ifdef JEMALLOC_C11ATOMICS #include <stdatomic.h> @@ -941,7 +948,7 @@ ivsalloc(const void *ptr, bool demote) extent_node_t *node; /* Return 0 if ptr is not within a chunk managed by jemalloc. */ - node = chunk_lookup(CHUNK_ADDR2BASE(ptr)); + node = chunk_lookup(ptr, false); if (node == NULL) return (0); /* Only arena chunks should be looked up via interior pointers. */ diff --git a/include/jemalloc/internal/jemalloc_internal_defs.h b/include/jemalloc/internal/jemalloc_internal_defs.h index 21ddbe2..eda4532 100644 --- a/include/jemalloc/internal/jemalloc_internal_defs.h +++ b/include/jemalloc/internal/jemalloc_internal_defs.h @@ -199,6 +199,12 @@ /* #undef JEMALLOC_IVSALLOC */ /* + * If defined, explicitly attempt to more uniformly distribute large allocation + * pointer alignments across all cache indices. + */ +/* #undef JEMALLOC_CACHE_OBLIVIOUS */ + +/* * Darwin (OS X) uses zones to work around Mach-O symbol override shortcomings. */ /* #undef JEMALLOC_ZONE */ |