diff options
| author | Jason Evans <je@facebook.com> | 2010-05-12 01:24:19 (GMT) |
|---|---|---|
| committer | Jason Evans <je@facebook.com> | 2010-05-12 01:24:19 (GMT) |
| commit | e13243eb630fee6099932c4bb117b009127b9218 (patch) | |
| tree | fbc8138b51d2bd96b207ab7ece413a46a17bbf3a /jemalloc/include | |
| parent | 1af6ac42e303f229d5e8bb38252b1fb7371081b2 (diff) | |
| parent | 7013d10a9e8e1a183542111747dc9c324560975a (diff) | |
| download | jemalloc-1.0.2.zip jemalloc-1.0.2.tar.gz jemalloc-1.0.2.tar.bz2 | |
Merge branch 'dev'1.0.2
Diffstat (limited to 'jemalloc/include')
| -rw-r--r-- | jemalloc/include/jemalloc/internal/chunk_mmap.h | 1 | ||||
| -rw-r--r-- | jemalloc/include/jemalloc/internal/tcache.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/jemalloc/include/jemalloc/internal/chunk_mmap.h b/jemalloc/include/jemalloc/internal/chunk_mmap.h index 8fb90b7..dc52448 100644 --- a/jemalloc/include/jemalloc/internal/chunk_mmap.h +++ b/jemalloc/include/jemalloc/internal/chunk_mmap.h @@ -10,6 +10,7 @@ #ifdef JEMALLOC_H_EXTERNS void *chunk_alloc_mmap(size_t size); +void *chunk_alloc_mmap_noreserve(size_t size); void chunk_dealloc_mmap(void *chunk, size_t size); #endif /* JEMALLOC_H_EXTERNS */ diff --git a/jemalloc/include/jemalloc/internal/tcache.h b/jemalloc/include/jemalloc/internal/tcache.h index fa6c53f..a8be436 100644 --- a/jemalloc/include/jemalloc/internal/tcache.h +++ b/jemalloc/include/jemalloc/internal/tcache.h @@ -353,7 +353,7 @@ tcache_dalloc_large(tcache_t *tcache, void *ptr, size_t size) #ifdef JEMALLOC_FILL if (opt_junk) - memset(ptr, 0x5a, arena->bins[binind].reg_size); + memset(ptr, 0x5a, size); #endif tbin = &tcache->tbins[binind]; |