diff options
| author | Jason Evans <jasone@canonware.com> | 2016-05-13 04:07:08 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-05-13 04:07:08 (GMT) |
| commit | a397045323d743a787c7efff17c0619dcf25f0b4 (patch) | |
| tree | 96038ce6afbe9945ff710fa045d3558e2d66ec66 | |
| parent | dc7ff6306d7a15b53479e2fb8e5546404b82e6fc (diff) | |
| download | jemalloc-a397045323d743a787c7efff17c0619dcf25f0b4.zip jemalloc-a397045323d743a787c7efff17c0619dcf25f0b4.tar.gz jemalloc-a397045323d743a787c7efff17c0619dcf25f0b4.tar.bz2 | |
Use TSDN_NULL rather than NULL as appropriate.
| -rw-r--r-- | include/jemalloc/internal/mb.h | 4 | ||||
| -rw-r--r-- | src/jemalloc.c | 4 | ||||
| -rw-r--r-- | src/tsd.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/jemalloc/internal/mb.h b/include/jemalloc/internal/mb.h index 437c86f..5384728 100644 --- a/include/jemalloc/internal/mb.h +++ b/include/jemalloc/internal/mb.h @@ -105,8 +105,8 @@ mb_write(void) malloc_mutex_t mtx; malloc_mutex_init(&mtx, "mb", WITNESS_RANK_OMIT); - malloc_mutex_lock(NULL, &mtx); - malloc_mutex_unlock(NULL, &mtx); + malloc_mutex_lock(TSDN_NULL, &mtx); + malloc_mutex_unlock(TSDN_NULL, &mtx); } #endif #endif diff --git a/src/jemalloc.c b/src/jemalloc.c index 40eb2ea..941c1c8 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1251,9 +1251,9 @@ malloc_init_hard_needed(void) if (malloc_initializer != NO_INITIALIZER && !IS_INITIALIZER) { /* Busy-wait until the initializing thread completes. */ do { - malloc_mutex_unlock(NULL, &init_lock); + malloc_mutex_unlock(TSDN_NULL, &init_lock); CPU_SPINWAIT; - malloc_mutex_lock(NULL, &init_lock); + malloc_mutex_lock(TSDN_NULL, &init_lock); } while (!malloc_initialized()); return (false); } @@ -171,10 +171,10 @@ tsd_init_check_recursion(tsd_init_head_t *head, tsd_init_block_t *block) tsd_init_block_t *iter; /* 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) { if (iter->thread == self) { - malloc_mutex_unlock(NULL, &head->lock); + malloc_mutex_unlock(TSDN_NULL, &head->lock); 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); block->thread = self; ql_tail_insert(&head->blocks, block, link); - malloc_mutex_unlock(NULL, &head->lock); + malloc_mutex_unlock(TSDN_NULL, &head->lock); return (NULL); } @@ -190,8 +190,8 @@ void 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); - malloc_mutex_unlock(NULL, &head->lock); + malloc_mutex_unlock(TSDN_NULL, &head->lock); } #endif |