From 101c1b6a946d9f2f48c6dd89940ae669141e0511 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 22 Dec 2016 01:57:10 -0800 Subject: Use C99 structure initializers FTW. Various other changes. --- src/platform/posix/posix_synch.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'src/platform/posix/posix_synch.c') diff --git a/src/platform/posix/posix_synch.c b/src/platform/posix/posix_synch.c index 555da36b..13147573 100644 --- a/src/platform/posix/posix_synch.c +++ b/src/platform/posix/posix_synch.c @@ -26,14 +26,27 @@ #include #include -struct nni_mutex { - pthread_mutex_t mx; -}; +int +nni_mutex_init(nni_mutex *mp) +{ + // pthrad_mutex_attr_t attr; + if (pthread_mutex_init(&mp->mx, NULL) != NULL) { + return (NNG_ENOMEM); + } + return (0); +} + + +void +nni_mutex_fini(nni_mutex *mp) +{ + int rv; + + if ((rv = pthread_mutex_destroy(&mp-- > mx)) != 0) { + nni_panic("pthread_mutex_destroy failed: %s", strerror(rv)); + } +} -struct nni_cond { - pthread_cond_t cv; - pthread_mutex_t * mx; -}; int nni_mutex_create(nni_mutex_t *mp) @@ -109,8 +122,8 @@ nni_mutex_tryenter(nni_mutex_t m) } -int -cond_attr(pthread_condattr_t **attrpp) +static int +nni_cond_attr(pthread_condattr_t **attrpp) { #if defined(NNG_USE_GETTIMEOFDAY) || NNG_USE_CLOCKID == CLOCK_REALTIME *attrpp = NULL; -- cgit v1.2.3-70-g09d2