diff options
| -rw-r--r-- | src/platform/posix/posix_synch.c | 8 | ||||
| -rw-r--r-- | src/platform/posix/posix_thread.c | 18 | ||||
| -rw-r--r-- | tests/sock.c | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/platform/posix/posix_synch.c b/src/platform/posix/posix_synch.c index e693a641..a08dfdf5 100644 --- a/src/platform/posix/posix_synch.c +++ b/src/platform/posix/posix_synch.c @@ -18,13 +18,13 @@ #include <time.h> #include <string.h> -extern pthread_condattr_t nni_condattr; -extern pthread_mutexattr_t nni_mutexattr; +extern pthread_condattr_t nni_cvattr; +extern pthread_mutexattr_t nni_mxattr; int nni_mutex_init(nni_mutex *mp) { - if (pthread_mutex_init(&mp->mx, &nni_mutexattr) != 0) { + if (pthread_mutex_init(&mp->mx, &nni_mxattr) != 0) { return (NNG_ENOMEM); } return (0); @@ -73,7 +73,7 @@ nni_mutex_tryenter(nni_mutex *m) int nni_cond_init(nni_cond *c, nni_mutex *m) { - if (pthread_cond_init(&c->cv, &nni_condattr) != 0) { + if (pthread_cond_init(&c->cv, &nni_cvattr) != 0) { // In theory could be EAGAIN, but handle like ENOMEM nni_free(c, sizeof (*c)); return (NNG_ENOMEM); diff --git a/src/platform/posix/posix_thread.c b/src/platform/posix/posix_thread.c index 42057f39..00dc8589 100644 --- a/src/platform/posix/posix_thread.c +++ b/src/platform/posix/posix_thread.c @@ -91,8 +91,8 @@ nni_atfork_child(void) } -pthread_condattr_t nni_condattr; -pthread_mutexattr_t nni_mutexattr; +pthread_condattr_t nni_cvattr; +pthread_mutexattr_t nni_mxattr; int nni_plat_init(int (*helper)(void)) @@ -110,24 +110,24 @@ nni_plat_init(int (*helper)(void)) pthread_mutex_unlock(&nni_plat_lock); return (0); } - if (pthread_condattr_init(&nni_condattr) != 0) { + if (pthread_condattr_init(&nni_cvattr) != 0) { pthread_mutex_unlock(&nni_plat_lock); return (NNG_ENOMEM); } #if !defined(NNG_USE_GETTIMEOFDAY) && NNG_USE_CLOCKID != CLOCK_REALTIME - if (pthread_condattr_setclock(&nni_condattr, NNG_USE_CLOCKID) != 0) { + if (pthread_condattr_setclock(&nni_cvattr, NNG_USE_CLOCKID) != 0) { pthread_mutex_unlock(&nni_plat_lock); return (NNG_ENOMEM); } #endif - if (pthread_mutexattr_init(&nni_mutexattr) != 0) { + if (pthread_mutexattr_init(&nni_mxattr) != 0) { pthread_mutex_unlock(&nni_plat_lock); return (NNG_ENOMEM); } - if (pthread_mutexattr_settype(&nni_mutexattr, - PTHREAD_MUTEX_ERRORCHECK) != 0) { + rv = pthread_mutexattr_settype(&nni_mxattr, PTHREAD_MUTEX_ERRORCHECK); + if (rv != 0) { pthread_mutex_unlock(&nni_plat_lock); return (NNG_ENOMEM); } @@ -165,8 +165,8 @@ nni_plat_fini(void) { pthread_mutex_lock(&nni_plat_lock); if (nni_plat_inited) { - pthread_mutexattr_destroy(&nni_mutexattr); - pthread_condattr_destroy(&nni_condattr); + pthread_mutexattr_destroy(&nni_mxattr); + pthread_condattr_destroy(&nni_cvattr); nni_plat_inited = 0; } pthread_mutex_unlock(&nni_plat_lock); diff --git a/tests/sock.c b/tests/sock.c index 76942d31..137e6e7f 100644 --- a/tests/sock.c +++ b/tests/sock.c @@ -11,6 +11,7 @@ #include "nng.h" TestMain("Socket Operations", { + ConveySetVerbose(); Convey("We are able to open a PAIR socket", { int rv; nng_socket *sock = NULL; |