diff options
author | Multivitamin <DasUmba@.(none)> | 2012-04-13 10:49:09 +0200 |
---|---|---|
committer | Multivitamin <DasUmba@.(none)> | 2012-04-13 10:49:09 +0200 |
commit | 126fd13e5d6b57dc0c8830248d44db504c7d103f (patch) | |
tree | e33b3e612f5e1e694a7028c4fe5171f0105c6654 /dep/jemalloc/src/mutex.c | |
parent | 6400c13fcb342fff7e2d808e469f2c57d83766c5 (diff) |
DEP: Updated Jemalloc to Version 2.5
Signed-off-by: Multivitamin <DasUmba@.(none)>
Diffstat (limited to 'dep/jemalloc/src/mutex.c')
-rw-r--r-- | dep/jemalloc/src/mutex.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dep/jemalloc/src/mutex.c b/dep/jemalloc/src/mutex.c index 3ecb18a340e..ca89ef1c962 100644 --- a/dep/jemalloc/src/mutex.c +++ b/dep/jemalloc/src/mutex.c @@ -55,6 +55,9 @@ pthread_create(pthread_t *__restrict thread, bool malloc_mutex_init(malloc_mutex_t *mutex) { +#ifdef JEMALLOC_OSSPIN + *mutex = 0; +#else pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr) != 0) @@ -70,6 +73,7 @@ malloc_mutex_init(malloc_mutex_t *mutex) } pthread_mutexattr_destroy(&attr); +#endif return (false); } @@ -77,8 +81,10 @@ void malloc_mutex_destroy(malloc_mutex_t *mutex) { +#ifndef JEMALLOC_OSSPIN if (pthread_mutex_destroy(mutex) != 0) { malloc_write("<jemalloc>: Error in pthread_mutex_destroy()\n"); abort(); } +#endif } |