summaryrefslogtreecommitdiffstats
path: root/lib/libthr
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-09-08 08:48:53 +0000
committerkib <kib@FreeBSD.org>2015-09-08 08:48:53 +0000
commitb522c482ce6b0cc8601a1552392c4fec6a4169e5 (patch)
tree3c4d9fe6c21dfc3b3db5b081bab945c622d8756b /lib/libthr
parent36ed4c24810223c6030532a9506c299899136b94 (diff)
downloadFreeBSD-src-b522c482ce6b0cc8601a1552392c4fec6a4169e5.zip
FreeBSD-src-b522c482ce6b0cc8601a1552392c4fec6a4169e5.tar.gz
Style. Use ANSI definition, wrap long lines, no initialization in
declaration for locals. Sponsored by: The FreeBSD Foundation MFC after: 1 week
Diffstat (limited to 'lib/libthr')
-rw-r--r--lib/libthr/thread/thr_once.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c
index 4a6b4d7..208b703 100644
--- a/lib/libthr/thread/thr_once.c
+++ b/lib/libthr/thread/thr_once.c
@@ -50,9 +50,11 @@ __weak_reference(_pthread_once, pthread_once);
static void
once_cancel_handler(void *arg)
{
- pthread_once_t *once_control = arg;
+ pthread_once_t *once_control;
- if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS, ONCE_NEVER_DONE))
+ once_control = arg;
+ if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS,
+ ONCE_NEVER_DONE))
return;
atomic_store_rel_int(&once_control->state, ONCE_NEVER_DONE);
_thr_umtx_wake(&once_control->state, INT_MAX, 0);
@@ -73,13 +75,17 @@ _pthread_once(pthread_once_t *once_control, void (*init_routine) (void))
return (0);
}
if (state == ONCE_NEVER_DONE) {
- if (atomic_cmpset_int(&once_control->state, state, ONCE_IN_PROGRESS))
+ if (atomic_cmpset_int(&once_control->state, state,
+ ONCE_IN_PROGRESS))
break;
} else if (state == ONCE_IN_PROGRESS) {
- if (atomic_cmpset_int(&once_control->state, state, ONCE_WAIT))
- _thr_umtx_wait_uint(&once_control->state, ONCE_WAIT, NULL, 0);
+ if (atomic_cmpset_int(&once_control->state, state,
+ ONCE_WAIT))
+ _thr_umtx_wait_uint(&once_control->state,
+ ONCE_WAIT, NULL, 0);
} else if (state == ONCE_WAIT) {
- _thr_umtx_wait_uint(&once_control->state, state, NULL, 0);
+ _thr_umtx_wait_uint(&once_control->state, state,
+ NULL, 0);
} else
return (EINVAL);
}
@@ -88,7 +94,8 @@ _pthread_once(pthread_once_t *once_control, void (*init_routine) (void))
THR_CLEANUP_PUSH(curthread, once_cancel_handler, once_control);
init_routine();
THR_CLEANUP_POP(curthread, 0);
- if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS, ONCE_DONE))
+ if (atomic_cmpset_rel_int(&once_control->state, ONCE_IN_PROGRESS,
+ ONCE_DONE))
return (0);
atomic_store_rel_int(&once_control->state, ONCE_DONE);
_thr_umtx_wake(&once_control->state, INT_MAX, 0);
@@ -96,6 +103,6 @@ _pthread_once(pthread_once_t *once_control, void (*init_routine) (void))
}
void
-_thr_once_init()
+_thr_once_init(void)
{
}
OpenPOWER on IntegriCloud