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

Use TSDN_NULL rather than NULL as appropriate.

Browse Source
This commit is contained in:
Jason Evans 2016-05-12 21:07:08 -07:00
parent dc7ff6306d
commit a397045323
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/jemalloc/internal/mb.h
View File

@ -105,8 +105,8 @@ mb_write(void)
malloc_mutex_t mtx; malloc_mutex_t mtx;
malloc_mutex_init(&mtx, "mb", WITNESS_RANK_OMIT); malloc_mutex_init(&mtx, "mb", WITNESS_RANK_OMIT);
malloc_mutex_lock(NULL, &mtx); malloc_mutex_lock(TSDN_NULL, &mtx);
malloc_mutex_unlock(NULL, &mtx); malloc_mutex_unlock(TSDN_NULL, &mtx);
} }
#endif #endif
#endif #endif

4
src/jemalloc.c
View File

@ -1251,9 +1251,9 @@ malloc_init_hard_needed(void)
if (malloc_initializer != NO_INITIALIZER && !IS_INITIALIZER) { if (malloc_initializer != NO_INITIALIZER && !IS_INITIALIZER) {
/* Busy-wait until the initializing thread completes. */ /* Busy-wait until the initializing thread completes. */
do { do {
malloc_mutex_unlock(NULL, &init_lock); malloc_mutex_unlock(TSDN_NULL, &init_lock);
CPU_SPINWAIT; CPU_SPINWAIT;
malloc_mutex_lock(NULL, &init_lock); malloc_mutex_lock(TSDN_NULL, &init_lock);
} while (!malloc_initialized()); } while (!malloc_initialized());
return (false); return (false);
} }

10
src/tsd.c
View File

@ -171,10 +171,10 @@ tsd_init_check_recursion(tsd_init_head_t *head, tsd_init_block_t *block)
tsd_init_block_t *iter; tsd_init_block_t *iter;
/* Check whether this thread has already inserted into the list. */ /* Check whether this thread has already inserted into the list. */
malloc_mutex_lock(NULL, &head->lock); malloc_mutex_lock(TSDN_NULL, &head->lock);
ql_foreach(iter, &head->blocks, link) { ql_foreach(iter, &head->blocks, link) {
if (iter->thread == self) { if (iter->thread == self) {
malloc_mutex_unlock(NULL, &head->lock); malloc_mutex_unlock(TSDN_NULL, &head->lock);
return (iter->data); return (iter->data);
} }
} }
@ -182,7 +182,7 @@ tsd_init_check_recursion(tsd_init_head_t *head, tsd_init_block_t *block)
ql_elm_new(block, link); ql_elm_new(block, link);
block->thread = self; block->thread = self;
ql_tail_insert(&head->blocks, block, link); ql_tail_insert(&head->blocks, block, link);
malloc_mutex_unlock(NULL, &head->lock); malloc_mutex_unlock(TSDN_NULL, &head->lock);
return (NULL); return (NULL);
} }
@ -190,8 +190,8 @@ void
tsd_init_finish(tsd_init_head_t *head, tsd_init_block_t *block) tsd_init_finish(tsd_init_head_t *head, tsd_init_block_t *block)
{ {
malloc_mutex_lock(NULL, &head->lock); malloc_mutex_lock(TSDN_NULL, &head->lock);
ql_remove(&head->blocks, block, link); ql_remove(&head->blocks, block, link);
malloc_mutex_unlock(NULL, &head->lock); malloc_mutex_unlock(TSDN_NULL, &head->lock);
} }
#endif #endif