project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix prof_{malloc,free}_sample_object() call order in prof_realloc().

Browse Source 
Fix prof_realloc() to call prof_free_sampled_object() after calling
prof_malloc_sample_object().  Prior to this fix, if tctx and old_tctx
were the same, the tctx could have been prematurely destroyed.
This commit is contained in:
Jason Evans 2015-09-14 23:44:37 -07:00
parent 23f6e103c8
commit ea8d97b897
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -35,6 +35,9 @@ brevity. Much more detail can be found in the git revision history:
allocation events against concurrent prof_active changes. allocation events against concurrent prof_active changes.
- Fix ixallocx_prof() to pass usize_max and zero to ixallocx_prof_sample() in - Fix ixallocx_prof() to pass usize_max and zero to ixallocx_prof_sample() in
the correct order. the correct order.
- Fix prof_realloc() to call prof_free_sampled_object() after calling
prof_malloc_sample_object(). Prior to this fix, if tctx and old_tctx were
the same, the tctx could have been prematurely destroyed.
* 4.0.0 (August 17, 2015) * 4.0.0 (August 17, 2015)

11
include/jemalloc/internal/prof.h
View File

@ -483,6 +483,7 @@ JEMALLOC_ALWAYS_INLINE void
prof_realloc(tsd_t *tsd, const void *ptr, size_t usize, prof_tctx_t *tctx, prof_realloc(tsd_t *tsd, const void *ptr, size_t usize, prof_tctx_t *tctx,
bool prof_active, bool updated, size_t old_usize, prof_tctx_t *old_tctx) bool prof_active, bool updated, size_t old_usize, prof_tctx_t *old_tctx)
{ {
bool sampled, old_sampled;
cassert(config_prof); cassert(config_prof);
assert(ptr != NULL || (uintptr_t)tctx <= (uintptr_t)1U); assert(ptr != NULL || (uintptr_t)tctx <= (uintptr_t)1U);
@ -501,12 +502,16 @@ prof_realloc(tsd_t *tsd, const void *ptr, size_t usize, prof_tctx_t *tctx,
} }
} }
if (unlikely((uintptr_t)old_tctx > (uintptr_t)1U)) sampled = ((uintptr_t)tctx > (uintptr_t)1U);
prof_free_sampled_object(tsd, old_usize, old_tctx); old_sampled = ((uintptr_t)old_tctx > (uintptr_t)1U);
if (unlikely((uintptr_t)tctx > (uintptr_t)1U))
if (unlikely(sampled))
prof_malloc_sample_object(ptr, usize, tctx); prof_malloc_sample_object(ptr, usize, tctx);
else else
prof_tctx_set(ptr, usize, (prof_tctx_t *)(uintptr_t)1U); prof_tctx_set(ptr, usize, (prof_tctx_t *)(uintptr_t)1U);
if (unlikely(old_sampled))
prof_free_sampled_object(tsd, old_usize, old_tctx);
} }
JEMALLOC_ALWAYS_INLINE void JEMALLOC_ALWAYS_INLINE void