summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2013-12-16 05:49:40 (GMT)
committerJason Evans <jasone@canonware.com>2013-12-16 05:57:09 (GMT)
commit6e62984ef6ca4312cf0a2e49ea2cc38feb94175b (patch)
tree7fbee95e1bdd18181509c331225b2390561898b9 /src
parent665769357cd77b74e00a146f196fff19243b33c4 (diff)
downloadjemalloc-6e62984ef6ca4312cf0a2e49ea2cc38feb94175b.zip
jemalloc-6e62984ef6ca4312cf0a2e49ea2cc38feb94175b.tar.gz
jemalloc-6e62984ef6ca4312cf0a2e49ea2cc38feb94175b.tar.bz2
Don't junk-fill reallocations unless usize changes.
Don't junk fill reallocations for which the request size is less than the current usable size, but not enough smaller to cause a size class change. Unlike malloc()/calloc()/realloc(), *allocx() contractually treats the full usize as the allocation, so a caller can ask for zeroed memory via mallocx() and a series of rallocx() calls that all specify MALLOCX_ZERO, and be assured that all newly allocated bytes will be zeroed and made available to the application without danger of allocator mutation until the size class decreases enough to cause usize reduction.
Diffstat (limited to 'src')
-rw-r--r--src/arena.c15
-rw-r--r--src/huge.c4
2 files changed, 3 insertions, 16 deletions
diff --git a/src/arena.c b/src/arena.c
index 4a46013..406cf5d 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -1938,10 +1938,6 @@ arena_ralloc_large(void *ptr, size_t oldsize, size_t size, size_t extra,
psize = PAGE_CEILING(size + extra);
if (psize == oldsize) {
/* Same size class. */
- if (config_fill && opt_junk && size < oldsize) {
- memset((void *)((uintptr_t)ptr + size), 0x5a, oldsize -
- size);
- }
return (false);
} else {
arena_chunk_t *chunk;
@@ -1953,8 +1949,8 @@ arena_ralloc_large(void *ptr, size_t oldsize, size_t size, size_t extra,
if (psize < oldsize) {
/* Fill before shrinking in order avoid a race. */
if (config_fill && opt_junk) {
- memset((void *)((uintptr_t)ptr + size), 0x5a,
- oldsize - size);
+ memset((void *)((uintptr_t)ptr + psize), 0x5a,
+ oldsize - psize);
}
arena_ralloc_large_shrink(arena, chunk, ptr, oldsize,
psize);
@@ -1988,13 +1984,8 @@ arena_ralloc_no_move(void *ptr, size_t oldsize, size_t size, size_t extra,
if ((size + extra <= SMALL_MAXCLASS &&
SMALL_SIZE2BIN(size + extra) ==
SMALL_SIZE2BIN(oldsize)) || (size <= oldsize &&
- size + extra >= oldsize)) {
- if (config_fill && opt_junk && size < oldsize) {
- memset((void *)((uintptr_t)ptr + size),
- 0x5a, oldsize - size);
- }
+ size + extra >= oldsize))
return (ptr);
- }
} else {
assert(size <= arena_maxclass);
if (size + extra > SMALL_MAXCLASS) {
diff --git a/src/huge.c b/src/huge.c
index 33fab68..ea9a2ad 100644
--- a/src/huge.c
+++ b/src/huge.c
@@ -89,10 +89,6 @@ huge_ralloc_no_move(void *ptr, size_t oldsize, size_t size, size_t extra)
&& CHUNK_CEILING(oldsize) >= CHUNK_CEILING(size)
&& CHUNK_CEILING(oldsize) <= CHUNK_CEILING(size+extra)) {
assert(CHUNK_CEILING(oldsize) == oldsize);
- if (config_fill && opt_junk && size < oldsize) {
- memset((void *)((uintptr_t)ptr + size), 0x5a,
- oldsize - size);
- }
return (ptr);
}