From 400e12265d99964f8445bb6d717321eb73152cc5 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 24 Nov 2015 16:37:15 +0100 Subject: Replace MUTEX_INITIALIZER with _LIBC_LOCK_INITIALIZER in generic code * sysdeps/mach/hurd/libc-lock.h (_LIBC_LOCK_INITIALIZER): Define. (__libc_lock_define_initialized): Use it. * sysdeps/nptl/libc-lockP.h (_LIBC_LOCK_INITIALIZER): Define. * malloc/arena.c (list_lock): Use _LIBC_LOCK_INITIALIZER. * malloc/malloc.c (main_arena): Likewise. * sysdeps/generic/malloc-machine.h (MUTEX_INITIALIZER): Remove. * sysdeps/nptl/malloc-machine.h (MUTEX_INITIALIZER): Remove. --- ChangeLog | 11 +++++++++++ malloc/arena.c | 2 +- malloc/malloc.c | 2 +- sysdeps/generic/malloc-machine.h | 1 - sysdeps/mach/hurd/libc-lock.h | 3 ++- sysdeps/nptl/libc-lockP.h | 1 + sysdeps/nptl/malloc-machine.h | 1 - 7 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e682445249..f8c18b141b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2015-11-24 Florian Weimer + + Replace MUTEX_INITIALIZER with _LIBC_LOCK_INITIALIZER in generic code. + * sysdeps/mach/hurd/libc-lock.h (_LIBC_LOCK_INITIALIZER): Define. + (__libc_lock_define_initialized): Use it. + * sysdeps/nptl/libc-lockP.h (_LIBC_LOCK_INITIALIZER): Define. + * malloc/arena.c (list_lock): Use _LIBC_LOCK_INITIALIZER. + * malloc/malloc.c (main_arena): Likewise. + * sysdeps/generic/malloc-machine.h (MUTEX_INITIALIZER): Remove. + * sysdeps/nptl/malloc-machine.h (MUTEX_INITIALIZER): Remove. + 2015-11-23 Joseph Myers * sysdeps/unix/sysv/linux/aarch64/sys/ptrace.h diff --git a/malloc/arena.c b/malloc/arena.c index 0f00afaf22..3dab7bb297 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -73,7 +73,7 @@ static __thread mstate thread_arena attribute_tls_model_ie; objects. No other (malloc) locks must be taken while list_lock is active, otherwise deadlocks may occur. */ -static mutex_t list_lock = MUTEX_INITIALIZER; +static mutex_t list_lock = _LIBC_LOCK_INITIALIZER; static size_t narenas = 1; static mstate free_list; diff --git a/malloc/malloc.c b/malloc/malloc.c index 839263efc5..a030109c3e 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1760,7 +1760,7 @@ struct malloc_par static struct malloc_state main_arena = { - .mutex = MUTEX_INITIALIZER, + .mutex = _LIBC_LOCK_INITIALIZER, .next = &main_arena, .attached_threads = 1 }; diff --git a/sysdeps/generic/malloc-machine.h b/sysdeps/generic/malloc-machine.h index 802d1f5b43..7b7eae807b 100644 --- a/sysdeps/generic/malloc-machine.h +++ b/sysdeps/generic/malloc-machine.h @@ -38,7 +38,6 @@ typedef int mutex_t; # define mutex_lock(m) ({ *(m) = 1; 0; }) # define mutex_trylock(m) (*(m) ? 1 : ((*(m) = 1), 0)) # define mutex_unlock(m) (*(m) = 0) -# define MUTEX_INITIALIZER (0) #endif /* !defined mutex_init */ diff --git a/sysdeps/mach/hurd/libc-lock.h b/sysdeps/mach/hurd/libc-lock.h index b67a049bca..4f3bb5cbf5 100644 --- a/sysdeps/mach/hurd/libc-lock.h +++ b/sysdeps/mach/hurd/libc-lock.h @@ -50,8 +50,9 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; CLASS __libc_lock_t NAME; /* Define an initialized lock variable NAME with storage class CLASS. */ +#define _LIBC_LOCK_INITIALIZER MUTEX_INITIALIZER #define __libc_lock_define_initialized(CLASS,NAME) \ - CLASS __libc_lock_t NAME = MUTEX_INITIALIZER; + CLASS __libc_lock_t NAME = _LIBC_LOCK_INITIALIZER; /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ diff --git a/sysdeps/nptl/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index 29494fd67b..3881b45b30 100644 --- a/sysdeps/nptl/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -75,6 +75,7 @@ typedef pthread_key_t __libc_key_t; initialized locks must be set to one due to the lack of normal atomic operations.) */ +#define _LIBC_LOCK_INITIALIZER LLL_LOCK_INITIALIZER #if IS_IN (libc) || IS_IN (libpthread) # if LLL_LOCK_INITIALIZER == 0 # define __libc_lock_define_initialized(CLASS,NAME) \ diff --git a/sysdeps/nptl/malloc-machine.h b/sysdeps/nptl/malloc-machine.h index 8dea606f5e..d46a9d919c 100644 --- a/sysdeps/nptl/malloc-machine.h +++ b/sysdeps/nptl/malloc-machine.h @@ -31,7 +31,6 @@ __libc_lock_define (typedef, mutex_t) #define mutex_lock(m) __libc_lock_lock (*(m)) #define mutex_trylock(m) __libc_lock_trylock (*(m)) #define mutex_unlock(m) __libc_lock_unlock (*(m)) -#define MUTEX_INITIALIZER LLL_LOCK_INITIALIZER /* This is defined by newer gcc version unique for each module. */ extern void *__dso_handle __attribute__ ((__weak__)); -- cgit v1.2.3-65-gdbad