Changeset 67a56d37474d1336d5e7e07d07f5b1241c66654c

Timestamp:

03/06/08 16:55:06 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1204822506 +0000

git-parent:

[273d4cce9641aea3d517d9617002bd89b432f256]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1204822506 +0000

Message:

more nukes.

Files:

• src/utils/noit_atomic.h (modified) (3 diffs)

src/utils/noit_atomic.h

@@ -21 +21 @@
-#define noit_atomic_cas32(ref,new,old) (OSAtomicCompareAndSwap32(old,new,ref) ? old : new)
-#define noit_atomic_cas64(ref,new,old) (OSAtomicCompareAndSwap64(old,new,ref) ? old : new)
+#define noit_atomic_add32(ref,diff) OSAtomicAdd32(ref,diff)
+#define noit_atomic_add64(ref,diff) OSAtomicAdd64(ref,diff)
+#define noit_atomic_sub32(ref,diff) OSAtomicAdd32(ref,0-(diff))
+#define noit_atomic_sub64(ref,diff) OSAtomicAdd64(ref,0-(diff))
-#define noit_atomic_inc32(ref) OSAtomicIncrement32(ref)
-#define noit_atomic_inc64(ref) OSAtomicIncrement64(ref)
@@ -92 +96 @@
-  while(noit_atomic_cas32(lock, 0, 1) != 1);
-}
-
+int 
-  return (noit_atomic_cas32(lock, 1, 0) == 0);
-}
@@ -100 +104 @@
-#endif
-
+#ifndef noit_atomic_add32
+static inline void noit_atomic_add32(volatile noit_atomic32_t *loc,
+                                     volatile noit_atomic32_t diff) {
+  register noit_atomic32_t current;
+  do {
+    current = *(loc);
+  } while(noit_atomic_cas32(loc, current + diff, current) != current);
+}
-#endif
+
+#ifndef noit_atomic_add64
+static inline void noit_atomic_add64(volatile noit_atomic64_t *loc,
+                                     volatile noit_atomic64_t diff) {
+  register noit_atomic64_t current;
+  do {
+    current = *(loc);
+  } while(noit_atomic_cas64(loc, current + diff, current) != current);
+}
+#endif
+
+#ifndef noit_atomic_sub32
+static inline void noit_atomic_sub32(volatile noit_atomic32_t *loc,
+                                     volatile noit_atomic32_t diff) {
+  register noit_atomic32_t current;
+  do {
+    current = *(loc);
+  } while(noit_atomic_cas32(loc, current - diff, current) != current);
+}
+#endif
+
+#ifndef noit_atomic_sub64
+static inline void noit_atomic_sub64(volatile noit_atomic64_t *loc,
+                                     volatile noit_atomic64_t diff) {
+  register noit_atomic64_t current;
+  do {
+    current = *(loc);
+  } while(noit_atomic_cas64(loc, current - diff, current) != current);
+}
+#endif
+
+#ifndef noit_atomic_inc32
+#define noit_atomic_inc32(a) noit_atomic_add32(a, 1)
+#endif
+
+#ifndef noit_atomic_inc64
+#define noit_atomic_inc64(a) noit_atomic_add64(a, 1)
+#endif
+
+#ifndef noit_atomic_dec32
+#define noit_atomic_dec32(a) noit_atomic_add32(a, -1)
+#endif
+
+#ifndef noit_atomic_dec64
+#define noit_atomic_dec64(a) noit_atomic_add64(a, -1)
+#endif
+
+#endif