From 77635bf532488b180024ef50c0583e43111fee0f Mon Sep 17 00:00:00 2001 From: Matthew Parkinson Date: Fri, 4 Nov 2016 10:27:32 +0000 Subject: Fixes to Visual Studio Project files --- msvc/projects/vc2015/jemalloc/jemalloc.vcxproj | 6 +++++- msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj index 9315022..8342ab3 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj @@ -69,12 +69,14 @@ + + - + @@ -110,11 +112,13 @@ + + {8D6BB292-9E1C-413D-9F98-4864BDC1514A} diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters index 88c15ef..37f0f02 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters @@ -146,6 +146,12 @@ Header Files\internal + + Header Files\internal + + + Header Files\internal + Header Files\internal @@ -161,7 +167,7 @@ Header Files\internal - + Header Files\internal @@ -241,6 +247,9 @@ Source Files + + Source Files + Source Files @@ -256,5 +265,8 @@ Source Files + + Source Files + - \ No newline at end of file + -- cgit v0.12 From 28b7e42e44a1a77218a941d9dfe5bb643d884219 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Fri, 4 Nov 2016 15:00:08 -0700 Subject: Fix arena data structure size calculation. Fix paren placement so that QUANTUM_CEILING() applies to the correct portion of the expression that computes how much memory to base_alloc(). In practice this bug had no impact. This was caused by 5d8db15db91c85d47b343cfc07fc6ea736f0de48 (Simplify run quantization.), which in turn fixed an over-allocation regression caused by 3c4d92e82a31f652a7c77ca937a02d0185085b06 (Add per size class huge allocation statistics.). --- src/arena.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arena.c b/src/arena.c index 43c3ccf..d737ec9 100644 --- a/src/arena.c +++ b/src/arena.c @@ -3461,8 +3461,8 @@ arena_new(tsdn_t *tsdn, unsigned ind) if (config_stats) { arena = (arena_t *)base_alloc(tsdn, CACHELINE_CEILING(sizeof(arena_t)) + - QUANTUM_CEILING((nlclasses * sizeof(malloc_large_stats_t)) + - (nhclasses * sizeof(malloc_huge_stats_t)))); + QUANTUM_CEILING((nlclasses * sizeof(malloc_large_stats_t))) + + (nhclasses * sizeof(malloc_huge_stats_t))); } else arena = (arena_t *)base_alloc(tsdn, sizeof(arena_t)); if (arena == NULL) -- cgit v0.12 From 23f04ef9b7f6b48fd41ae895a21f351e6f549b7d Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Fri, 4 Nov 2016 15:15:24 -0700 Subject: Update ChangeLog for 4.3.0. --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index ac2e4d3..118df96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ brevity. Much more detail can be found in the git revision history: deadlocks during thread exit. (@jasone) - Fix over-sized allocation of radix tree leaf nodes. (@mjp41, @ogaun, @jasone) + - Fix over-sized allocation of arena_t (plus associated stats) data + structures. (@jasone, @interwq) - Fix EXTRA_CFLAGS to not affect configuration. (@jasone) - Fix a Valgrind integration bug. (@ronawho) - Disallow 0x5a junk filling when running in Valgrind. (@jasone) -- cgit v0.12