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

Fix arena_reset() crashing bug.

Browse Source 
This regression was caused by 498856f44a
(Move slabs out of chunks.).
This commit is contained in:
Jason Evans 2016-11-15 10:31:06 -08:00
parent a2e601a223
commit c0a667112c
1 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/arena.c
View File

@ -799,6 +799,47 @@ arena_slab_dalloc(tsdn_t *tsdn, arena_t *arena, extent_t *slab)
arena_extent_cache_dalloc_locked(tsdn, arena, &extent_hooks, slab); arena_extent_cache_dalloc_locked(tsdn, arena, &extent_hooks, slab);
} }
static void
arena_bin_slabs_nonfull_insert(arena_bin_t *bin, extent_t *slab)
{
assert(extent_slab_data_get(slab)->nfree > 0);
extent_heap_insert(&bin->slabs_nonfull, slab);
}
static void
arena_bin_slabs_nonfull_remove(arena_bin_t *bin, extent_t *slab)
{
extent_heap_remove(&bin->slabs_nonfull, slab);
}
static extent_t *
arena_bin_slabs_nonfull_tryget(arena_bin_t *bin)
{
extent_t *slab = extent_heap_remove_first(&bin->slabs_nonfull);
if (slab == NULL)
return (NULL);
if (config_stats)
bin->stats.reslabs++;
return (slab);
}
static void
arena_bin_slabs_full_insert(arena_bin_t *bin, extent_t *slab)
{
assert(extent_slab_data_get(slab)->nfree == 0);
extent_ring_insert(&bin->slabs_full, slab);
}
static void
arena_bin_slabs_full_remove(extent_t *slab)
{
extent_ring_remove(slab);
}
void void
arena_reset(tsd_t *tsd, arena_t *arena) arena_reset(tsd_t *tsd, arena_t *arena)
{ {
@ -863,6 +904,7 @@ arena_reset(tsd_t *tsd, arena_t *arena)
for (slab = qr_next(&bin->slabs_full, qr_link); slab != for (slab = qr_next(&bin->slabs_full, qr_link); slab !=
&bin->slabs_full; slab = qr_next(&bin->slabs_full, &bin->slabs_full; slab = qr_next(&bin->slabs_full,
qr_link)) { qr_link)) {
arena_bin_slabs_full_remove(slab);
malloc_mutex_unlock(tsd_tsdn(tsd), &bin->lock); malloc_mutex_unlock(tsd_tsdn(tsd), &bin->lock);
arena_slab_dalloc(tsd_tsdn(tsd), arena, slab); arena_slab_dalloc(tsd_tsdn(tsd), arena, slab);
malloc_mutex_lock(tsd_tsdn(tsd), &bin->lock); malloc_mutex_lock(tsd_tsdn(tsd), &bin->lock);
@ -880,47 +922,6 @@ arena_reset(tsd_t *tsd, arena_t *arena)
malloc_mutex_unlock(tsd_tsdn(tsd), &arena->lock); malloc_mutex_unlock(tsd_tsdn(tsd), &arena->lock);
} }
static void
arena_bin_slabs_nonfull_insert(arena_bin_t *bin, extent_t *slab)
{
assert(extent_slab_data_get(slab)->nfree > 0);
extent_heap_insert(&bin->slabs_nonfull, slab);
}
static void
arena_bin_slabs_nonfull_remove(arena_bin_t *bin, extent_t *slab)
{
extent_heap_remove(&bin->slabs_nonfull, slab);
}
static extent_t *
arena_bin_slabs_nonfull_tryget(arena_bin_t *bin)
{
extent_t *slab = extent_heap_remove_first(&bin->slabs_nonfull);
if (slab == NULL)
return (NULL);
if (config_stats)
bin->stats.reslabs++;
return (slab);
}
static void
arena_bin_slabs_full_insert(arena_bin_t *bin, extent_t *slab)
{
assert(extent_slab_data_get(slab)->nfree == 0);
extent_ring_insert(&bin->slabs_full, slab);
}
static void
arena_bin_slabs_full_remove(extent_t *slab)
{
extent_ring_remove(slab);
}
static extent_t * static extent_t *
arena_slab_alloc_hard(tsdn_t *tsdn, arena_t *arena, arena_slab_alloc_hard(tsdn_t *tsdn, arena_t *arena,
extent_hooks_t **r_extent_hooks, const arena_bin_info_t *bin_info) extent_hooks_t **r_extent_hooks, const arena_bin_info_t *bin_info)