diff options
| author | Jason Evans <jasone@canonware.com> | 2009-11-09 22:57:38 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2009-11-09 22:57:38 (GMT) |
| commit | a25d0a8a724da309f6930ba7bbd0b3a6f7cc64aa (patch) | |
| tree | 4ef7b2b88c09b93fc45c9554f5cb86fed01bf744 /jemalloc | |
| parent | 662a017c1d3c6596bcad4fd2c220889b8676158d (diff) | |
| download | jemalloc-a25d0a8a724da309f6930ba7bbd0b3a6f7cc64aa.zip jemalloc-a25d0a8a724da309f6930ba7bbd0b3a6f7cc64aa.tar.gz jemalloc-a25d0a8a724da309f6930ba7bbd0b3a6f7cc64aa.tar.bz2 | |
Update assertions in realloc() and free() to allow for deallocation during
initializtion.
Diffstat (limited to 'jemalloc')
| -rw-r--r-- | jemalloc/src/jemalloc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jemalloc/src/jemalloc.c b/jemalloc/src/jemalloc.c index f7d69df..13039a0 100644 --- a/jemalloc/src/jemalloc.c +++ b/jemalloc/src/jemalloc.c @@ -4897,8 +4897,8 @@ malloc_init_hard(void) if (malloc_initialized || malloc_initializer == pthread_self()) { /* * Another thread initialized the allocator before this one - * acquired init_lock, or this thread is the inializing thread, - * and it is recursively allocating. + * acquired init_lock, or this thread is the initializing + * thread, and it is recursively allocating. */ malloc_mutex_unlock(&init_lock); return (false); @@ -5613,7 +5613,8 @@ realloc(void *ptr, size_t size) } if (ptr != NULL) { - assert(malloc_initialized); + assert(malloc_initialized || malloc_initializer == + pthread_self()); ret = iralloc(ptr, size); @@ -5659,7 +5660,8 @@ free(void *ptr) { if (ptr != NULL) { - assert(malloc_initialized); + assert(malloc_initialized || malloc_initializer == + pthread_self()); idalloc(ptr); UTRACE(ptr, 0, 0); |