diff options
| author | Mike Hommey <mh@glandium.org> | 2015-09-03 20:32:57 +0900 |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2015-11-09 15:38:30 -0800 |
| commit | f97298bfc1c6edbb4fd00820e9e028e8d213af73 (patch) | |
| tree | e4aada68bb896fe0c1631814e75eb4ad2b664580 /src/arena.c | |
| parent | 566d4c02400700b94a952eddeed34313360211d3 (diff) | |
| download | jemalloc-f97298bfc1c6edbb4fd00820e9e028e8d213af73.tar.gz | |
Remove arena_run_dalloc_decommit().
This resolves #284.
Diffstat (limited to 'src/arena.c')
| -rw-r--r-- | src/arena.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/arena.c b/src/arena.c index 43733cc..58797de 100644 --- a/src/arena.c +++ b/src/arena.c @@ -1660,18 +1660,6 @@ arena_run_size_get(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, return (size); } -static bool -arena_run_decommit(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run) -{ - arena_chunk_map_misc_t *miscelm = arena_run_to_miscelm(run); - size_t run_ind = arena_miscelm_to_pageind(miscelm); - size_t offset = run_ind << LG_PAGE; - size_t length = arena_run_size_get(arena, chunk, run, run_ind); - - return (arena->chunk_hooks.decommit(chunk, chunksize, offset, length, - arena->ind)); -} - static void arena_run_dalloc(arena_t *arena, arena_run_t *run, bool dirty, bool cleaned, bool decommitted) @@ -1750,15 +1738,6 @@ arena_run_dalloc(arena_t *arena, arena_run_t *run, bool dirty, bool cleaned, } static void -arena_run_dalloc_decommit(arena_t *arena, arena_chunk_t *chunk, - arena_run_t *run) -{ - bool committed = arena_run_decommit(arena, chunk, run); - - arena_run_dalloc(arena, run, committed, false, !committed); -} - -static void arena_run_trim_head(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, size_t oldsize, size_t newsize) { @@ -2441,7 +2420,7 @@ arena_dalloc_bin_run(arena_t *arena, arena_chunk_t *chunk, arena_run_t *run, malloc_mutex_unlock(&bin->lock); /******************************/ malloc_mutex_lock(&arena->lock); - arena_run_dalloc_decommit(arena, chunk, run); + arena_run_dalloc(arena, run, true, false, false); malloc_mutex_unlock(&arena->lock); /****************************/ malloc_mutex_lock(&bin->lock); @@ -2584,7 +2563,7 @@ arena_dalloc_large_locked_impl(arena_t *arena, arena_chunk_t *chunk, } } - arena_run_dalloc_decommit(arena, chunk, run); + arena_run_dalloc(arena, run, true, false, false); } void |