Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/jemalloc/dist/include/jemalloc/internal use c99...



details:   https://anonhg.NetBSD.org/src/rev/999b57406349
branches:  trunk
changeset: 997337:999b57406349
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 04 17:24:02 2019 +0000

description:
use c99 initializers

diffstat:

 external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h |  15 +++++------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r ee220dc8671a -r 999b57406349 external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h
--- a/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h      Mon Mar 04 17:23:37 2019 +0000
+++ b/external/bsd/jemalloc/dist/include/jemalloc/internal/mutex.h      Mon Mar 04 17:24:02 2019 +0000
@@ -94,28 +94,27 @@
 #    define MALLOC_MUTEX_TRYLOCK(m) (pthread_mutex_trylock(&(m)->lock) != 0)
 #endif
 
-#define LOCK_PROF_DATA_INITIALIZER                                     \
-    {NSTIME_ZERO_INITIALIZER, NSTIME_ZERO_INITIALIZER, 0, 0, 0,                \
-           ATOMIC_INIT(0), 0, NULL, 0}
-
 #ifdef _WIN32
 #  define MALLOC_MUTEX_INITIALIZER
 #elif (defined(JEMALLOC_OS_UNFAIR_LOCK))
 #  define MALLOC_MUTEX_INITIALIZER                                     \
-     {{{LOCK_PROF_DATA_INITIALIZER, OS_UNFAIR_LOCK_INIT}},             \
+     {{{MUTEX_PROF_DATA_INITIALIZER, OS_UNFAIR_LOCK_INIT}},            \
       WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
 #elif (defined(JEMALLOC_OSSPIN))
 #  define MALLOC_MUTEX_INITIALIZER                                     \
-     {{{LOCK_PROF_DATA_INITIALIZER, 0}},                               \
+     {{{MUTEX_PROF_DATA_INITIALIZER, 0}},                              \
       WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
 #elif (defined(JEMALLOC_MUTEX_INIT_CB))
 #  define MALLOC_MUTEX_INITIALIZER                                     \
-     {{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}}, \
+     {{{MUTEX_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}},        \
       WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
 #else
 #    define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT
 #    define MALLOC_MUTEX_INITIALIZER                                   \
-       {{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER}},     \
+       {{{
+       .prof_data = MUTEX_PROF_DATA_INITIALIZER, 
+       .lock = PTHREAD_MUTEX_INITIALIZER,
+       }},     \
         WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
 #endif
 



Home | Main Index | Thread Index | Old Index