diff options
| author | Jason Evans <jasone@canonware.com> | 2016-05-12 21:07:08 -0700 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-10-04 15:56:56 -0700 |
| commit | bcd5424b1c5361534b3c535326d0b87f223a42e1 (patch) | |
| tree | 50c980ef33dbe41bde11c42d88e1a1e2fd0a51e7 /src | |
| parent | c19b48fe73b18eb39182e15cb31f4695a7e10b7f (diff) | |
| download | jemalloc-bcd5424b1c5361534b3c535326d0b87f223a42e1.tar.gz | |
Use TSDN_NULL rather than NULL as appropriate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jemalloc.c | 4 | ||||
| -rw-r--r-- | src/tsd.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index c1ecc73..0d776b6 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1252,9 +1252,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 |