From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 24 Oct 2008 21:59:52 +0000 (+0000)
Subject: rx-atomics-for-solaris-and-darwin-20081023
X-Git-Tag: openafs-devel-1_5_61~729
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e73e2ff4b53bfdfe16fec2d65776facae853eddd

rx-atomics-for-solaris-and-darwin-20081023

LICENSE IPL10

support atomics on osx and solaris
---

diff --git a/src/rx/rx_internal.h b/src/rx/rx_internal.h
index b582e68..f03f62b 100644
--- a/src/rx/rx_internal.h
+++ b/src/rx/rx_internal.h
@@ -30,6 +30,13 @@
 #ifndef	_RX_INTERNAL_H_
 #define _RX_INTERNAL_H_
 
+#ifdef AFS_DARWIN80_ENV
+#include <libkern/OSAtomic.h>
+#endif
+#ifdef AFS_SUN58_ENV
+#include <sys/atomic.h>
+#endif
+
 #ifdef AFS_NT40_ENV
 #ifndef _WIN64
 #ifndef __cplusplus
@@ -61,6 +68,54 @@
         InterlockedDecrement(&object2); \
         MUTEX_EXIT(&mutex); \
     } while (0)
+#elif defined(AFS_DARWIN80_ENV)
+#define rx_MutexIncrement(object, mutex) OSAtomicIncrement32(&object)
+#define rx_MutexOr(object, operand, mutex) OSAtomicOr32(operand, &object)
+#define rx_MutexAnd(object, operand, mutex) OSAtomicAnd32(operand, &object)
+#define rx_MutexXor(object, operand, mutex) OSAtomicXor32(operand, &object)
+#define rx_MutexAdd(object, addend, mutex) OSAtomicAdd32(addend, &object)
+#define rx_MutexDecrement(object, mutex) OSAtomicDecrement32(&object)
+#define rx_MutexAdd1Increment2(object1, addend, object2, mutex) \
+    do { \
+        MUTEX_ENTER(&mutex); \
+        object1 += addend; \
+        OSAtomicIncrement32(&object2); \
+        MUTEX_EXIT(&mutex); \
+    } while (0)
+#define rx_MutexAdd1Decrement2(object1, addend, object2, mutex) \
+    do { \
+        MUTEX_ENTER(&mutex); \
+        object1 += addend; \
+        OSAtomicDecrement32(&object2); \
+        MUTEX_EXIT(&mutex); \
+    } while (0)
+#elif defined(AFS_SUN58_ENV)
+#define rx_MutexIncrement(object, mutex) atomic_inc_32(&object)
+#define rx_MutexOr(object, operand, mutex) atomic_or_32(&object, operand)
+#define rx_MutexAnd(object, operand, mutex) atomic_and_32(&object, operand)
+#define rx_MutexXor(object, operand, mutex) \
+    do { \
+        MUTEX_ENTER(&mutex); \
+        object ^= operand; \
+        MUTEX_EXIT(&mutex); \
+    } while(0)
+#define rx_MutexXor(object, operand, mutex) OSAtomicXor32Barrier(operand, &object)
+#define rx_MutexAdd(object, addend, mutex) atomic_add_32(&object, addend)
+#define rx_MutexDecrement(object, mutex) atomic_dec_32(&object)
+#define rx_MutexAdd1Increment2(object1, addend, object2, mutex) \
+    do { \
+        MUTEX_ENTER(&mutex); \
+        object1 += addend; \
+        atomic_inc_32(&object2); \
+        MUTEX_EXIT(&mutex); \
+    } while (0)
+#define rx_MutexAdd1Decrement2(object1, addend, object2, mutex) \
+    do { \
+        MUTEX_ENTER(&mutex); \
+        object1 += addend; \
+        atomic_dec_32(&object2); \
+        MUTEX_EXIT(&mutex); \
+    } while (0)
 #else
 #define rx_MutexIncrement(object, mutex) \
     do { \