diff options
| author | Jason Evans <je@fb.com> | 2011-02-01 04:12:32 (GMT) |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2011-02-01 04:12:32 (GMT) |
| commit | a73ebd946ab00cacf9bbad6a5edf6aea50c18c0f (patch) | |
| tree | c010f45dadcf57cd2f2bd67ef5ffba0b03e6e602 /jemalloc/src/arena.c | |
| parent | 1c4b088b08d3bc7617a34387e196ce03716160bf (diff) | |
| parent | ada55b2e926dd3200a88cfe5ed84b3ea1d4de25f (diff) | |
| download | jemalloc-2.1.1.zip jemalloc-2.1.1.tar.gz jemalloc-2.1.1.tar.bz2 | |
Merge branch 'dev'2.1.1
Diffstat (limited to 'jemalloc/src/arena.c')
| -rw-r--r-- | jemalloc/src/arena.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/jemalloc/src/arena.c b/jemalloc/src/arena.c index 7f939b3..3cf15ff 100644 --- a/jemalloc/src/arena.c +++ b/jemalloc/src/arena.c @@ -1358,8 +1358,6 @@ arena_tcache_fill_small(arena_t *arena, tcache_bin_t *tbin, size_t binind #endif malloc_mutex_unlock(&bin->lock); tbin->ncached = i; - if (tbin->ncached > tbin->high_water) - tbin->high_water = tbin->ncached; } #endif @@ -1369,7 +1367,6 @@ arena_tcache_fill_small(arena_t *arena, tcache_bin_t *tbin, size_t binind * *) bin->run_size >= min_run_size * *) bin->run_size <= arena_maxclass * *) run header overhead <= RUN_MAX_OVRHD (or header overhead relaxed). - * *) run header size < PAGE_SIZE * * bin->nregs and bin->reg0_offset are also calculated here, since these * settings are all interdependent. @@ -1455,8 +1452,7 @@ arena_bin_run_size_calc(arena_bin_t *bin, size_t min_run_size) } while (try_run_size <= arena_maxclass && try_run_size <= arena_maxclass && RUN_MAX_OVRHD * (bin->reg_size << 3) > RUN_MAX_OVRHD_RELAX - && (try_reg0_offset << RUN_BFP) > RUN_MAX_OVRHD * try_run_size - && try_hdr_size < PAGE_SIZE); + && (try_reg0_offset << RUN_BFP) > RUN_MAX_OVRHD * try_run_size); assert(good_hdr_size <= good_reg0_offset); |