summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorOran Agra <oran@redislabs.com>2018-07-11 16:09:00 +0300
committerYoav Steinberg <yoav@monfort.co.il>2021-10-10 18:29:13 +0300
commit91bc78a8b8e3dee4bb531cc37f4fbd87db928cc5 (patch)
tree3d9e3841ed906876e37d67bb412e86776691bce5 /deps
parent29d7f97c96dd19db7200cf49595478be2e72be7f (diff)
downloadredis-91bc78a8b8e3dee4bb531cc37f4fbd87db928cc5.tar.gz
Active defrag fixes for 32bit builds (again)
* overflow in jemalloc fragmentation hint to the defragger
Diffstat (limited to 'deps')
-rw-r--r--deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h4
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 a48e63a82..17b2472ff 100644
--- a/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
+++ b/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
@@ -238,8 +238,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);