diff options
| author | Oran Agra <oran@redislabs.com> | 2018-07-11 16:09:00 +0300 |
|---|---|---|
| committer | Oran Agra <oran@redislabs.com> | 2018-07-11 16:09:00 +0300 |
| commit | 920158ec812dde184200232cc347f589123b715d (patch) | |
| tree | 190438d83636056b4ea4d8ce5a7dd9c38479c658 /deps/jemalloc | |
| parent | f45e790125cc8141c10daefe25bf3530e484c61f (diff) | |
| download | redis-920158ec812dde184200232cc347f589123b715d.tar.gz | |
Active defrag fixes for 32bit builds (again)
* overflow in jemalloc fragmentation hint to the defragger
Diffstat (limited to 'deps/jemalloc')
| -rw-r--r-- | deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h index 540c168e5..290e5cf99 100644 --- a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h +++ b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h @@ -234,8 +234,8 @@ iget_defrag_hint(tsdn_t *tsdn, void* ptr, int *bin_util, int *run_util) { if (slab != bin->slabcur) { const bin_info_t *bin_info = &bin_infos[binind]; size_t availregs = bin_info->nregs * bin->stats.curslabs; - *bin_util = (bin->stats.curregs<<16) / availregs; - *run_util = ((bin_info->nregs - extent_nfree_get(slab))<<16) / bin_info->nregs; + *bin_util = ((long long)bin->stats.curregs<<16) / availregs; + *run_util = ((long long)(bin_info->nregs - extent_nfree_get(slab))<<16) / bin_info->nregs; defrag = 1; } malloc_mutex_unlock(tsdn, &bin->lock); |