diff options
| author | Garrett D'Amore <garrett@damore.org> | 2016-12-23 02:08:40 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2016-12-23 02:08:40 -0800 |
| commit | 229d4c7decb71fd607aaec14ecbae81e380cc700 (patch) | |
| tree | f35cef9f46113d86a6b33d04c188bbdb948cf150 /src/platform | |
| parent | 471a454900ab6142e5a3c1f53866996172d2aad4 (diff) | |
| download | nng-229d4c7decb71fd607aaec14ecbae81e380cc700.tar.gz nng-229d4c7decb71fd607aaec14ecbae81e380cc700.tar.bz2 nng-229d4c7decb71fd607aaec14ecbae81e380cc700.zip | |
Uncrustify fixes.
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/posix/posix_impl.h | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_synch.c | 2 | ||||
| -rw-r--r-- | src/platform/posix/posix_thread.c | 11 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/platform/posix/posix_impl.h b/src/platform/posix/posix_impl.h index a07b5c92..2df96c71 100644 --- a/src/platform/posix/posix_impl.h +++ b/src/platform/posix/posix_impl.h @@ -21,7 +21,7 @@ #define PLATFORM_POSIX_ALLOC #define PLATFORM_POSIX_DEBUG #define PLATFORM_POSIX_CLOCK -#define PLATFORM_POSIX_RANDOM +#define PLATFORM_POSIX_RANDOM #define PLATFORM_POSIX_SYNCH #define PLATFORM_POSIX_THREAD diff --git a/src/platform/posix/posix_synch.c b/src/platform/posix/posix_synch.c index d4c4d6ac..e693a641 100644 --- a/src/platform/posix/posix_synch.c +++ b/src/platform/posix/posix_synch.c @@ -35,6 +35,7 @@ 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)); } @@ -139,4 +140,5 @@ nni_cond_waituntil(nni_cond *c, uint64_t usec) return (0); } + #endif diff --git a/src/platform/posix/posix_thread.c b/src/platform/posix/posix_thread.c index 24f97b81..42057f39 100644 --- a/src/platform/posix/posix_thread.c +++ b/src/platform/posix/posix_thread.c @@ -33,12 +33,14 @@ uint32_t nni_plat_nextid(void) { uint32_t id; + pthread_mutex_lock(&nni_plat_lock); id = nni_plat_next++; pthread_mutex_unlock(&nni_plat_lock); return (id); } + static void * nni_thrfunc(void *arg) { @@ -71,7 +73,7 @@ nni_thread_create(nni_thread **tp, void (*fn)(void *), void *arg) void -nni_thread_reap(nni_thread * thr) +nni_thread_reap(nni_thread *thr) { int rv; @@ -138,9 +140,9 @@ nni_plat_init(int (*helper)(void)) uint16_t xsub[3]; nni_time now = nni_clock(); - xsub[0] = (uint16_t)now; - xsub[1] = (uint16_t)(now >> 16); - xsub[2] = (uint16_t)(now >> 24); + xsub[0] = (uint16_t) now; + xsub[1] = (uint16_t) (now >> 16); + xsub[2] = (uint16_t) (now >> 24); nni_plat_next = nrand48(xsub); } #endif @@ -170,4 +172,5 @@ nni_plat_fini(void) pthread_mutex_unlock(&nni_plat_lock); } + #endif |