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.

diff --git a/ChangeLog b/ChangeLog
index 75615ab91e9c2a2894913f2c8b4c7ad0459eaec7..311d1f46b0453d5b5e13b3fd8840ac5b71a50296 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-11-24  Florian Weimer  <fweimer@redhat.com>
+
+       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-10-28  Florian Weimer  <fweimer@redhat.com>
 
        [BZ# 19048]

diff --git a/malloc/arena.c b/malloc/arena.c
index dff98702f168cc033eee24fd634339c1070e522f..f8cf182c2fe85aff77dade8a6734de845e665f2f 100644 (file)
--- 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 94066d2e8c66fc98572ecee6bd2ff4687b6b553f..eba20cde861aa94dea512f13427c328c25619aba 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1747,7 +1747,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 802d1f5b43957ac0facf8e8bb112b738a259014a..7b7eae807bbc063bd9cd2f5e58349bc73cac0206 100644 (file)
--- 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/bits/libc-lock.h b/sysdeps/mach/hurd/bits/libc-lock.h
index 24c3aa8add172449da1b7784f3ebbe77feb24a7a..ca9c3e305b67a696151af63e7492016384c0369a 100644 (file)
--- a/sysdeps/mach/hurd/bits/libc-lock.h
+++ b/sysdeps/mach/hurd/bits/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/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index f55f6212ec8dbc64b14b6bbecacbb3a2486246f9..fae8a2b14e28fbd69bf254adf4821b123578a959 100644 (file)
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/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 4d44089d3610ae852fd7917a15e3a22779ea78c8..0b679b725b84b37ae9c18ad63c227248dc9ca6b9 100644 (file)
--- 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__));