project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove MAP_NORESERVE support

Browse Source 
It was only used by the swap feature, and that is gone.
This commit is contained in:
Mike Hommey 2012-04-10 18:19:45 +02:00 committed by Jason Evans
parent a8683fbaf9
commit c5851eaf6e
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/jemalloc/internal/chunk_mmap.h
View File

@ -10,7 +10,6 @@
#ifdef JEMALLOC_H_EXTERNS #ifdef JEMALLOC_H_EXTERNS
void *chunk_alloc_mmap(size_t size); void *chunk_alloc_mmap(size_t size);
void *chunk_alloc_mmap_noreserve(size_t size);
void chunk_dealloc_mmap(void *chunk, size_t size); void chunk_dealloc_mmap(void *chunk, size_t size);
bool chunk_mmap_boot(void); bool chunk_mmap_boot(void);

41
src/chunk_mmap.c
View File

@ -15,16 +15,15 @@ malloc_tsd_funcs(JEMALLOC_INLINE, mmap_unaligned, bool, false,
/******************************************************************************/ /******************************************************************************/
/* Function prototypes for non-inline static functions. */ /* Function prototypes for non-inline static functions. */
static void *pages_map(void *addr, size_t size, bool noreserve); static void *pages_map(void *addr, size_t size);
static void pages_unmap(void *addr, size_t size); static void pages_unmap(void *addr, size_t size);
static void *chunk_alloc_mmap_slow(size_t size, bool unaligned, static void *chunk_alloc_mmap_slow(size_t size, bool unaligned);
bool noreserve); static void *chunk_alloc_mmap_internal(size_t size);
static void *chunk_alloc_mmap_internal(size_t size, bool noreserve);
/******************************************************************************/ /******************************************************************************/
static void * static void *
pages_map(void *addr, size_t size, bool noreserve) pages_map(void *addr, size_t size)
{ {
void *ret; void *ret;
@ -32,12 +31,8 @@ pages_map(void *addr, size_t size, bool noreserve)
* We don't use MAP_FIXED here, because it can cause the *replacement* * We don't use MAP_FIXED here, because it can cause the *replacement*
* of existing mappings, and we only want to create new mappings. * of existing mappings, and we only want to create new mappings.
*/ */
int flags = MAP_PRIVATE | MAP_ANON; ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
#ifdef MAP_NORESERVE -1, 0);
if (noreserve)
flags |= MAP_NORESERVE;
#endif
ret = mmap(addr, size, PROT_READ | PROT_WRITE, flags, -1, 0);
assert(ret != NULL); assert(ret != NULL);
if (ret == MAP_FAILED) if (ret == MAP_FAILED)
@ -78,7 +73,7 @@ pages_unmap(void *addr, size_t size)
} }
static void * static void *
chunk_alloc_mmap_slow(size_t size, bool unaligned, bool noreserve) chunk_alloc_mmap_slow(size_t size, bool unaligned)
{ {
void *ret; void *ret;
size_t offset; size_t offset;
@ -87,7 +82,7 @@ chunk_alloc_mmap_slow(size_t size, bool unaligned, bool noreserve)
if (size + chunksize <= size) if (size + chunksize <= size)
return (NULL); return (NULL);
ret = pages_map(NULL, size + chunksize, noreserve); ret = pages_map(NULL, size + chunksize);
if (ret == NULL) if (ret == NULL)
return (NULL); return (NULL);
@ -126,7 +121,7 @@ chunk_alloc_mmap_slow(size_t size, bool unaligned, bool noreserve)
} }
static void * static void *
chunk_alloc_mmap_internal(size_t size, bool noreserve) chunk_alloc_mmap_internal(size_t size)
{ {
void *ret; void *ret;
@ -161,7 +156,7 @@ chunk_alloc_mmap_internal(size_t size, bool noreserve)
if (mmap_unaligned_booted && *mmap_unaligned_tsd_get() == false) { if (mmap_unaligned_booted && *mmap_unaligned_tsd_get() == false) {
size_t offset; size_t offset;
ret = pages_map(NULL, size, noreserve); ret = pages_map(NULL, size);
if (ret == NULL) if (ret == NULL)
return (NULL); return (NULL);
@ -171,14 +166,13 @@ chunk_alloc_mmap_internal(size_t size, bool noreserve)
mmap_unaligned_tsd_set(&mu); mmap_unaligned_tsd_set(&mu);
/* Try to extend chunk boundary. */ /* Try to extend chunk boundary. */
if (pages_map((void *)((uintptr_t)ret + size), if (pages_map((void *)((uintptr_t)ret + size),
chunksize - offset, noreserve) == NULL) { chunksize - offset) == NULL) {
/* /*
* Extension failed. Clean up, then revert to * Extension failed. Clean up, then revert to
* the reliable-but-expensive method. * the reliable-but-expensive method.
*/ */
pages_unmap(ret, size); pages_unmap(ret, size);
ret = chunk_alloc_mmap_slow(size, true, ret = chunk_alloc_mmap_slow(size, true);
noreserve);
} else { } else {
/* Clean up unneeded leading space. */ /* Clean up unneeded leading space. */
pages_unmap(ret, chunksize - offset); pages_unmap(ret, chunksize - offset);
@ -187,7 +181,7 @@ chunk_alloc_mmap_internal(size_t size, bool noreserve)
} }
} }
} else } else
ret = chunk_alloc_mmap_slow(size, false, noreserve); ret = chunk_alloc_mmap_slow(size, false);
return (ret); return (ret);
} }
@ -196,14 +190,7 @@ void *
chunk_alloc_mmap(size_t size) chunk_alloc_mmap(size_t size)
{ {
return (chunk_alloc_mmap_internal(size, false)); return (chunk_alloc_mmap_internal(size));
}
void *
chunk_alloc_mmap_noreserve(size_t size)
{
return (chunk_alloc_mmap_internal(size, true));
} }
void void