diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-11-25 16:27:07 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-11-25 16:27:07 +0000 |
| commit | 5fefc2d24a19675e9b7cce654ec06022de2738ba (patch) | |
| tree | 31e007691d366123be7d27abc96d43b3b744c018 /libc/stdlib/malloc/malloc.h | |
| parent | 9d6d4ac6476107b42a9bdca8e794fdb309aeca28 (diff) | |
- remove some bloat that was added in r23660 and subsequent r23698.
The sbrk lock is only needed for LT.old
Diffstat (limited to 'libc/stdlib/malloc/malloc.h')
| -rw-r--r-- | libc/stdlib/malloc/malloc.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h index 2afc3a805..609b89748 100644 --- a/libc/stdlib/malloc/malloc.h +++ b/libc/stdlib/malloc/malloc.h @@ -130,24 +130,21 @@ extern int __malloc_mmb_debug; /* Locking for multithreaded apps. */ -#ifdef __UCLIBC_HAS_THREADS__ +#if defined __UCLIBC_HAS_THREADS__ && defined __LINUXTHREADS_OLD__ # include <pthread.h> # include <bits/uClibc_pthread.h> # define MALLOC_USE_LOCKING -typedef pthread_mutex_t malloc_mutex_t; -# define MALLOC_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER - # ifdef MALLOC_USE_SBRK /* This lock is used to serialize uses of the `sbrk' function (in both malloc and free, sbrk may be used several times in succession, and things will break if these multiple calls are interleaved with another thread's use of sbrk!). */ -extern malloc_mutex_t __malloc_sbrk_lock; -# define __malloc_lock_sbrk() __pthread_mutex_lock (&__malloc_sbrk_lock) -# define __malloc_unlock_sbrk() __pthread_mutex_unlock (&__malloc_sbrk_lock) +__UCLIBC_MUTEX_EXTERN(__malloc_sbrk_lock); +# define __malloc_lock_sbrk() __UCLIBC_MUTEX_LOCK(__malloc_sbrk_lock) +# define __malloc_unlock_sbrk() __UCLIBC_MUTEX_UNLOCK(__malloc_sbrk_lock) # endif /* MALLOC_USE_SBRK */ #else /* !__UCLIBC_HAS_THREADS__ */ @@ -222,9 +219,10 @@ extern void __malloc_debug_printf (int indent, const char *fmt, ...); /* The malloc heap. */ extern struct heap_free_area *__malloc_heap; -#ifdef __UCLIBC_HAS_THREADS__ -extern malloc_mutex_t __malloc_heap_lock; +#if defined __UCLIBC_HAS_THREADS__ +#include <bits/uClibc_mutex.h> +__UCLIBC_MUTEX_EXTERN(__malloc_heap_lock); #ifdef __UCLIBC_UCLINUX_BROKEN_MUNMAP__ -extern malloc_mutex_t __malloc_mmb_heap_lock; +__UCLIBC_MUTEX_EXTERN(__malloc_mmb_heap_lock); #endif #endif |