diff options
| author | Jason Evans <jasone@canonware.com> | 2015-09-15 22:55:37 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2015-09-15 22:55:37 (GMT) |
| commit | 9898051fd16ebd5d29dc27aae5e069fe04486ff3 (patch) | |
| tree | adeab60b769c0dffa0782bd46eb60e741b4a2ff9 /src/tcache.c | |
| parent | 6e98caf8f064482b9ab292ef3638dea67420bbc2 (diff) | |
| parent | 1d7540c9d71ee8a85ea97c9459698e090ee04719 (diff) | |
| download | jemalloc-4.0.1.zip jemalloc-4.0.1.tar.gz jemalloc-4.0.1.tar.bz2 | |
Merge branch 'dev'4.0.1
Diffstat (limited to 'src/tcache.c')
| -rw-r--r-- | src/tcache.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tcache.c b/src/tcache.c index 3814365..fdafd0c 100644 --- a/src/tcache.c +++ b/src/tcache.c @@ -32,7 +32,7 @@ size_t tcache_salloc(const void *ptr) void tcache_event_hard(tsd_t *tsd, tcache_t *tcache) { - index_t binind = tcache->next_gc_bin; + szind_t binind = tcache->next_gc_bin; tcache_bin_t *tbin = &tcache->tbins[binind]; tcache_bin_info_t *tbin_info = &tcache_bin_info[binind]; @@ -72,7 +72,7 @@ tcache_event_hard(tsd_t *tsd, tcache_t *tcache) void * tcache_alloc_small_hard(tsd_t *tsd, arena_t *arena, tcache_t *tcache, - tcache_bin_t *tbin, index_t binind) + tcache_bin_t *tbin, szind_t binind) { void *ret; @@ -87,7 +87,7 @@ tcache_alloc_small_hard(tsd_t *tsd, arena_t *arena, tcache_t *tcache, void tcache_bin_flush_small(tsd_t *tsd, tcache_t *tcache, tcache_bin_t *tbin, - index_t binind, unsigned rem) + szind_t binind, unsigned rem) { arena_t *arena; void *ptr; @@ -166,7 +166,7 @@ tcache_bin_flush_small(tsd_t *tsd, tcache_t *tcache, tcache_bin_t *tbin, } void -tcache_bin_flush_large(tsd_t *tsd, tcache_bin_t *tbin, index_t binind, +tcache_bin_flush_large(tsd_t *tsd, tcache_bin_t *tbin, szind_t binind, unsigned rem, tcache_t *tcache) { arena_t *arena; @@ -496,13 +496,13 @@ tcache_boot(void) unsigned i; /* - * If necessary, clamp opt_lg_tcache_max, now that arena_maxclass is + * If necessary, clamp opt_lg_tcache_max, now that large_maxclass is * known. */ if (opt_lg_tcache_max < 0 || (1U << opt_lg_tcache_max) < SMALL_MAXCLASS) tcache_maxclass = SMALL_MAXCLASS; - else if ((1U << opt_lg_tcache_max) > arena_maxclass) - tcache_maxclass = arena_maxclass; + else if ((1U << opt_lg_tcache_max) > large_maxclass) + tcache_maxclass = large_maxclass; else tcache_maxclass = (1U << opt_lg_tcache_max); |