summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2013-08-30 07:43:34 +0000
committerkib <kib@FreeBSD.org>2013-08-30 07:43:34 +0000
commit748f95c68727abdadaf3ea8816cc19784d05411d (patch)
treeacb64d2cb73acf38b896550a336a14d6a7b15f23
parentf8c0849efff16d60a8ceaa0515e45d857fdbad0c (diff)
downloadFreeBSD-src-748f95c68727abdadaf3ea8816cc19784d05411d.zip
FreeBSD-src-748f95c68727abdadaf3ea8816cc19784d05411d.tar.gz
Add BIT_AND_ATOMIC() and CPU_AND_ATOMIC().
Sponsored by: The FreeBSD Foundation Reviewed by: alc Tested by: pho, bf
-rw-r--r--sys/sys/bitset.h9
-rw-r--r--sys/sys/cpuset.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/sys/sys/bitset.h b/sys/sys/bitset.h
index dee5542..7c24ecd 100644
--- a/sys/sys/bitset.h
+++ b/sys/sys/bitset.h
@@ -135,7 +135,14 @@
atomic_set_long(&(p)->__bits[__bitset_word(_s, n)], \
__bitset_mask((_s), n))
-/* Convenience functions catering special cases. */
+/* Convenience functions catering special cases. */
+#define BIT_AND_ATOMIC(_s, d, s) do { \
+ __size_t __i; \
+ for (__i = 0; __i < __bitset_words((_s)); __i++) \
+ atomic_clear_long(&(d)->__bits[__i], \
+ ~(s)->__bits[__i]); \
+} while (0)
+
#define BIT_OR_ATOMIC(_s, d, s) do { \
__size_t __i; \
for (__i = 0; __i < __bitset_words((_s)); __i++) \
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h
index fc078d3..e1ee37d 100644
--- a/sys/sys/cpuset.h
+++ b/sys/sys/cpuset.h
@@ -55,6 +55,7 @@
#define CPU_NAND(d, s) BIT_NAND(CPU_SETSIZE, d, s)
#define CPU_CLR_ATOMIC(n, p) BIT_CLR_ATOMIC(CPU_SETSIZE, n, p)
#define CPU_SET_ATOMIC(n, p) BIT_SET_ATOMIC(CPU_SETSIZE, n, p)
+#define CPU_AND_ATOMIC(n, p) BIT_AND_ATOMIC(CPU_SETSIZE, n, p)
#define CPU_OR_ATOMIC(d, s) BIT_OR_ATOMIC(CPU_SETSIZE, d, s)
#define CPU_COPY_STORE_REL(f, t) BIT_COPY_STORE_REL(CPU_SETSIZE, f, t)
#define CPU_FFS(p) BIT_FFS(CPU_SETSIZE, p)
OpenPOWER on IntegriCloud