diff options
author | ed <ed@FreeBSD.org> | 2013-04-27 05:01:29 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2013-04-27 05:01:29 +0000 |
commit | e8028497402579e4a7f85d8714e9038ace9d44d2 (patch) | |
tree | 33f1253dc7e97a17927f446e96672ec5cef1ea4b | |
parent | f201fcc561ac7eab4ed7997403288e40b18a75a4 (diff) | |
download | FreeBSD-src-e8028497402579e4a7f85d8714e9038ace9d44d2.zip FreeBSD-src-e8028497402579e4a7f85d8714e9038ace9d44d2.tar.gz |
Use C11 <stdatomic.h> instead of our non-standard <machine/atomic.h>.
Reviewed by: pjd
-rw-r--r-- | sbin/hastd/primary.c | 13 | ||||
-rw-r--r-- | sbin/hastd/refcnt.h | 19 |
2 files changed, 21 insertions, 11 deletions
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c index a9dfa2b..92d1d9e 100644 --- a/sbin/hastd/primary.c +++ b/sbin/hastd/primary.c @@ -78,7 +78,7 @@ struct hio { * kernel. Each component has to decrease this counter by one * even on failure. */ - unsigned int hio_countdown; + refcnt_t hio_countdown; /* * Each component has a place to store its own error. * Once the request is handled by all components we can decide if the @@ -415,7 +415,7 @@ init_environment(struct hast_resource *res __unused) "Unable to allocate %zu bytes of memory for hio request.", sizeof(*hio)); } - hio->hio_countdown = 0; + refcnt_init(&hio->hio_countdown, 0); hio->hio_errors = malloc(sizeof(hio->hio_errors[0]) * ncomps); if (hio->hio_errors == NULL) { primary_exitx(EX_TEMPFAIL, @@ -1300,11 +1300,12 @@ ggate_recv_thread(void *arg) } pjdlog_debug(2, "ggate_recv: (%p) Moving request to the send queues.", hio); - hio->hio_countdown = ncomps; if (hio->hio_replication == HAST_REPLICATION_MEMSYNC && ggio->gctl_cmd == BIO_WRITE) { /* Each remote request needs two responses in memsync. */ - hio->hio_countdown++; + refcnt_init(&hio->hio_countdown, ncomps + 1); + } else { + refcnt_init(&hio->hio_countdown, ncomps); } for (ii = ncomp; ii < ncomps; ii++) QUEUE_INSERT1(hio, send, ii); @@ -2139,7 +2140,7 @@ sync_thread(void *arg __unused) ncomp = 1; } mtx_unlock(&metadata_lock); - hio->hio_countdown = 1; + refcnt_init(&hio->hio_countdown, 1); QUEUE_INSERT1(hio, send, ncomp); /* @@ -2189,7 +2190,7 @@ sync_thread(void *arg __unused) pjdlog_debug(2, "sync: (%p) Moving request to the send queue.", hio); - hio->hio_countdown = 1; + refcnt_init(&hio->hio_countdown, 1); QUEUE_INSERT1(hio, send, ncomp); /* diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h index a989df0..5e3fb34 100644 --- a/sbin/hastd/refcnt.h +++ b/sbin/hastd/refcnt.h @@ -32,24 +32,33 @@ #ifndef __REFCNT_H__ #define __REFCNT_H__ -#include <machine/atomic.h> +#include <stdatomic.h> #include "pjdlog.h" +typedef atomic_uint refcnt_t; + +static __inline void +refcnt_init(refcnt_t *count, unsigned int v) +{ + + atomic_init(count, v); +} + static __inline void -refcnt_acquire(volatile unsigned int *count) +refcnt_acquire(refcnt_t *count) { - atomic_add_acq_int(count, 1); + atomic_fetch_add_explicit(count, 1, memory_order_acquire); } static __inline unsigned int -refcnt_release(volatile unsigned int *count) +refcnt_release(refcnt_t *count) { unsigned int old; /* XXX: Should this have a rel membar? */ - old = atomic_fetchadd_int(count, -1); + old = atomic_fetch_sub(count, 1); PJDLOG_ASSERT(old > 0); return (old - 1); } |