From 87f02f6f898f3f283e0a8fbcfd8749579d4034ce Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sat, 15 Jun 2013 22:17:59 +0000 Subject: [PATCH] Let hastd use C11 atomics. C11 atomics now work on all the architectures. Have at least a single piece of software in our base system that uses C11 atomics. This somewhat makes it less likely that we break it because of LLVM imports, etc. --- sbin/hastd/refcnt.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/hastd/refcnt.h b/sbin/hastd/refcnt.h index 124604311519..5e3fb3467c64 100644 --- a/sbin/hastd/refcnt.h +++ b/sbin/hastd/refcnt.h @@ -32,24 +32,24 @@ #ifndef __REFCNT_H__ #define __REFCNT_H__ -#include +#include #include "pjdlog.h" -typedef unsigned int refcnt_t; +typedef atomic_uint refcnt_t; static __inline void refcnt_init(refcnt_t *count, unsigned int v) { - *count = v; + atomic_init(count, v); } static __inline void refcnt_acquire(refcnt_t *count) { - atomic_add_acq_int(count, 1); + atomic_fetch_add_explicit(count, 1, memory_order_acquire); } static __inline unsigned int @@ -58,7 +58,7 @@ 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); }