Changeset f64ae82bd480bcd2c18ef07b13d7ed71cf55bcbb

Timestamp:

02/23/11 21:09:32 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[5042c383741464af8911a7c93c91a525e72e48c7]

git-author:

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

Message:

strict-aliasing dance

Files:

• src/stratcon_datastore.c (modified) (1 diff)
• src/utils/noit_atomic.h (modified) (4 diffs)

src/stratcon_datastore.c

@@ -1570 +1570 @@
-                                               const char *, void *)) {
-  struct datastore_onlooker_list *nnode;
+  volatile void **vonlookers = (void *)&onlookers;
-  nnode = calloc(1, sizeof(*nnode));
-  nnode->dispatch = f;
-  nnode->next = onlookers;
-(volatile void **)&
+v
-                           nnode, nnode->next) != (void *)nnode->next)
-    nnode->next = onlookers;

src/utils/noit_atomic.h

@@ -41 +41 @@
-#if defined(__GNUC__)
-
-#if (SIZEOF_VOID_P == 4)
-#define noit_atomic_casptr(a,b,c) ((void *)noit_atomic_cas32((vpsized_int *)(a),(vpsized_int)(void *)(b),(vpsized_int)(void *)(c)))
-#elif (SIZEOF_VOID_P == 8)
-#define noit_atomic_casptr(a,b,c) ((void *)noit_atomic_cas64((vpsized_int *)(a),(vpsized_int)(void *)(b),(vpsized_int)(void *)(c)))
-#else
-#error unsupported pointer width
-#endif
-
-
-typedef noit_atomic32_t noit_spinlock_t;
-
-static inline noit_atomic32_t
-noit_atomic_cas32(volatile noit_atomic32_t *ptr,
@@ -64 +54 @@
-  return prev;
-}
+
+#if (SIZEOF_VOID_P == 4)
+static inline void *
+noit_atomic_casptr(volatile void **ptr,
+                   volatile void *rpl,
+                   volatile void *curr) {
+  void *prev;
+  __asm__ volatile (
+      "lock; cmpxchgl %1, %2"
+    : "=a" (prev)
+    : "r"  (rpl), "m" (*(ptr)), "0" (curr)
+    : "memory");
+  return prev;
+}
+#endif
-
-#ifdef __x86_64__
@@ -78 +83 @@
-  return prev;
-}
+#if (SIZEOF_VOID_P == 8)
+static inline void *
+noit_atomic_cas64(volatile void **ptr,
+                  volatile void *rpl,
+                  volatile void *curr) {
+  void *prev;
+  __asm__ volatile (
+      "lock; cmpxchgq %1, %2"
+    : "=a" (prev)
+    : "r"  (rpl), "m" (*(ptr)), "0" (curr)
+    : "memory");
+  return prev;
+}
+#endif
-#else
-static inline noit_atomic64_t
@@ -105 +124 @@
-  return prev;
-};
+#if (SIZEOF_VOID_P == 8)
+/* This should never be triggered.. 8 byte pointers on 32bit machines */
+#error "64bit pointers on a 32bit architecture?"
+#endif
-#endif
-