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

Get rid of redundant logic in prof

Browse Source
This commit is contained in:
Yinan Zhang 2020-01-16 20:43:45 -08:00
parent a72ea0db60
commit d331208560
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/prof_data.c
View File

@ -218,8 +218,8 @@ prof_gctx_create(tsdn_t *tsdn, prof_bt_t *bt) {
} }
static void static void
prof_gctx_try_destroy(tsd_t *tsd, prof_tdata_t *tdata_self, prof_gctx_t *gctx, prof_gctx_try_destroy(tsd_t *tsd, prof_tdata_t *tdata_self,
prof_tdata_t *tdata) { prof_gctx_t *gctx) {
cassert(config_prof); cassert(config_prof);
/* /*
@ -371,7 +371,7 @@ prof_lookup(tsd_t *tsd, prof_bt_t *bt) {
arena_ichoose(tsd, NULL), true); arena_ichoose(tsd, NULL), true);
if (ret.p == NULL) { if (ret.p == NULL) {
if (new_gctx) { if (new_gctx) {
prof_gctx_try_destroy(tsd, tdata, gctx, tdata); prof_gctx_try_destroy(tsd, tdata, gctx);
} }
return NULL; return NULL;
} }
@ -389,7 +389,7 @@ prof_lookup(tsd_t *tsd, prof_bt_t *bt) {
malloc_mutex_unlock(tsd_tsdn(tsd), tdata->lock); malloc_mutex_unlock(tsd_tsdn(tsd), tdata->lock);
if (error) { if (error) {
if (new_gctx) { if (new_gctx) {
prof_gctx_try_destroy(tsd, tdata, gctx, tdata); prof_gctx_try_destroy(tsd, tdata, gctx);
} }
idalloctm(tsd_tsdn(tsd), ret.v, NULL, NULL, true, true); idalloctm(tsd_tsdn(tsd), ret.v, NULL, NULL, true, true);
return NULL; return NULL;
@ -767,7 +767,7 @@ prof_gctx_finish(tsd_t *tsd, prof_gctx_tree_t *gctxs) {
if (prof_gctx_should_destroy(gctx)) { if (prof_gctx_should_destroy(gctx)) {
gctx->nlimbo++; gctx->nlimbo++;
malloc_mutex_unlock(tsd_tsdn(tsd), gctx->lock); malloc_mutex_unlock(tsd_tsdn(tsd), gctx->lock);
prof_gctx_try_destroy(tsd, tdata, gctx, tdata); prof_gctx_try_destroy(tsd, tdata, gctx);
} else { } else {
malloc_mutex_unlock(tsd_tsdn(tsd), gctx->lock); malloc_mutex_unlock(tsd_tsdn(tsd), gctx->lock);
} }
@ -1367,8 +1367,7 @@ prof_tdata_expire(tsdn_t *tsdn, prof_tdata_t *tdata) {
malloc_mutex_lock(tsdn, tdata->lock); malloc_mutex_lock(tsdn, tdata->lock);
if (!tdata->expired) { if (!tdata->expired) {
tdata->expired = true; tdata->expired = true;
destroy_tdata = tdata->attached ? false : destroy_tdata = prof_tdata_should_destroy(tsdn, tdata, false);
prof_tdata_should_destroy(tsdn, tdata, false);
} else { } else {
destroy_tdata = false; destroy_tdata = false;
} }
@ -1492,8 +1491,7 @@ prof_tctx_destroy(tsd_t *tsd, prof_tctx_t *tctx) {
} }
malloc_mutex_unlock(tsd_tsdn(tsd), gctx->lock); malloc_mutex_unlock(tsd_tsdn(tsd), gctx->lock);
if (destroy_gctx) { if (destroy_gctx) {
prof_gctx_try_destroy(tsd, prof_tdata_get(tsd, false), gctx, prof_gctx_try_destroy(tsd, prof_tdata_get(tsd, false), gctx);
tdata);
} }
malloc_mutex_assert_not_owner(tsd_tsdn(tsd), tctx->tdata->lock); malloc_mutex_assert_not_owner(tsd_tsdn(tsd), tctx->tdata->lock);