Remove redundent stats-merging logic when destroying tcache.

The removed stats merging logic is already taken care of by tcache_flush.
This commit is contained in:
Qi Wang 2017-01-13 15:22:16 -08:00 committed by Qi Wang
parent ffbb7dac3d
commit e8990dc7c7

View File

@ -357,11 +357,8 @@ tcache_destroy(tsd_t *tsd, tcache_t *tcache)
tcache_bin_t *tbin = &tcache->tbins[i]; tcache_bin_t *tbin = &tcache->tbins[i];
tcache_bin_flush_small(tsd, tcache, tbin, i, 0); tcache_bin_flush_small(tsd, tcache, tbin, i, 0);
if (config_stats && tbin->tstats.nrequests != 0) { if (config_stats) {
arena_bin_t *bin = &arena->bins[i]; assert(tbin->tstats.nrequests == 0);
malloc_mutex_lock(tsd_tsdn(tsd), &bin->lock);
bin->stats.nrequests += tbin->tstats.nrequests;
malloc_mutex_unlock(tsd_tsdn(tsd), &bin->lock);
} }
} }
@ -369,12 +366,8 @@ tcache_destroy(tsd_t *tsd, tcache_t *tcache)
tcache_bin_t *tbin = &tcache->tbins[i]; tcache_bin_t *tbin = &tcache->tbins[i];
tcache_bin_flush_large(tsd, tbin, i, 0, tcache); tcache_bin_flush_large(tsd, tbin, i, 0, tcache);
if (config_stats && tbin->tstats.nrequests != 0) { if (config_stats) {
malloc_mutex_lock(tsd_tsdn(tsd), &arena->lock); assert(tbin->tstats.nrequests == 0);
arena->stats.nrequests_large += tbin->tstats.nrequests;
arena->stats.lstats[i - NBINS].nrequests +=
tbin->tstats.nrequests;
malloc_mutex_unlock(tsd_tsdn(tsd), &arena->lock);
} }
} }