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

Change tsdn to tsd for thread name allocation

Browse Source
This commit is contained in:
Yinan Zhang 2020-03-31 10:43:04 -07:00
parent 841af2b426
commit adfd9d7b1d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/jemalloc/internal/prof_data.h
View File

@ -10,7 +10,7 @@ void prof_bt_hash(const void *key, size_t r_hash[2]);
bool prof_bt_keycomp(const void *k1, const void *k2); bool prof_bt_keycomp(const void *k1, const void *k2);
bool prof_data_init(tsd_t *tsd); bool prof_data_init(tsd_t *tsd);
char *prof_thread_name_alloc(tsdn_t *tsdn, const char *thread_name); char *prof_thread_name_alloc(tsd_t *tsd, const char *thread_name);
int prof_thread_name_set_impl(tsd_t *tsd, const char *thread_name); int prof_thread_name_set_impl(tsd_t *tsd, const char *thread_name);
bool prof_dump(tsd_t *tsd, bool propagate_err, const char *filename, bool prof_dump(tsd_t *tsd, bool propagate_err, const char *filename,
bool leakcheck); bool leakcheck);

2
src/prof.c
View File

@ -746,7 +746,7 @@ prof_tdata_reinit(tsd_t *tsd, prof_tdata_t *tdata) {
uint64_t thr_uid = tdata->thr_uid; uint64_t thr_uid = tdata->thr_uid;
uint64_t thr_discrim = tdata->thr_discrim + 1; uint64_t thr_discrim = tdata->thr_discrim + 1;
char *thread_name = (tdata->thread_name != NULL) ? char *thread_name = (tdata->thread_name != NULL) ?
prof_thread_name_alloc(tsd_tsdn(tsd), tdata->thread_name) : NULL; prof_thread_name_alloc(tsd, tdata->thread_name) : NULL;
bool active = tdata->active; bool active = tdata->active;
prof_tdata_detach(tsd, tdata); prof_tdata_detach(tsd, tdata);

8
src/prof_data.c
View File

@ -474,7 +474,7 @@ prof_bt_count(void) {
} }
char * char *
prof_thread_name_alloc(tsdn_t *tsdn, const char *thread_name) { prof_thread_name_alloc(tsd_t *tsd, const char *thread_name) {
char *ret; char *ret;
size_t size; size_t size;
@ -487,8 +487,8 @@ prof_thread_name_alloc(tsdn_t *tsdn, const char *thread_name) {
return ""; return "";
} }
ret = iallocztm(tsdn, size, sz_size2index(size), false, NULL, true, ret = iallocztm(tsd_tsdn(tsd), size, sz_size2index(size), false, NULL,
arena_get(TSDN_NULL, 0, true), true); true, arena_get(TSDN_NULL, 0, true), true);
if (ret == NULL) { if (ret == NULL) {
return NULL; return NULL;
} }
@ -520,7 +520,7 @@ prof_thread_name_set_impl(tsd_t *tsd, const char *thread_name) {
} }
} }
s = prof_thread_name_alloc(tsd_tsdn(tsd), thread_name); s = prof_thread_name_alloc(tsd, thread_name);
if (s == NULL) { if (s == NULL) {
return EAGAIN; return EAGAIN;
} }