Changeset 919b09a62be1e318c5b142de70468c11e8fc980e

Timestamp:

12/17/07 19:03:15 (11 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[c105913d38157700cbb9fbc7f0f6f8a7b18de103]

git-author:

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

Message:

umm.. that last commit was junk, I should work on one machine... This compiles on OpenBSD

Files:

• Makefile.in (modified) (1 diff)
• src/Makefile.in (modified) (2 diffs)
• src/eventer/eventer.c (modified) (1 diff)
• src/utils/noit_atomic.h (modified) (6 diffs)

Makefile.in

@@ -1 +1 @@
-all:
-        (cd src && make)
+
+clean:
+        (cd src && make clean)

src/Makefile.in

@@ -36 +36 @@
-noitd:  make-subdirs $(OBJS)
-        $(CC) -o $@ $(OBJS) \
+                $(LDFLAGS) \
-                -Leventer -leventer \
-                -Lutils -lnoit_utils \
-
+
+
-
-.c.o:
@@ -45 +47 @@
-clean-subdirs:
-        for dir in $(SUBS) ; do \
-make -C $$dir clean
+(cd $$dir && make clean)
-        done
-

src/eventer/eventer.c

@@ -28 +28 @@
-
-int eventer_choose(const char *name) {
-  int i;
-  eventer_impl_t choice;
-  for(choice = registered_eventers[0]; choice; choice++) {

src/utils/noit_atomic.h

@@ -9 +9 @@
-#include "noit_config.h"
-
-
+32
-typedef int64_t noit_atomic64_t;
-
@@ -30 +30 @@
-#elif defined(__GNUC__)
-
-typedef u_int32_t noit_atomic32_t
-typedef u_int64_t noit_atomic64_t
-
-#if (SIZEOF_VOID_P == 4)
-#define noit_atomic_casptr(a,b,c) noit_atomic_cas32((a),(void *)(b),(void *)(c))
@@ -41 +38 @@
-#endif
-
+typedef noit_atomic32_t noit_spinlock_t;
+
-static inline noit_atomic32_t
-
+,
-                  volatile noit_atomic32_t rpl,
-                  volatile noit_atomic32_t curr) {
@@ -56 +55 @@
-#ifdef __x86_64__
-static inline noit_atomic64_t
-
+,
-                  volatile noit_atomic64_t rpl,
-                  volatile noit_atomic64_t curr) {
@@ -69 +68 @@
-#else
-static inline noit_atomic64_t
-
+,
-                  volatile noit_atomic64_t rpl,
-                  volatile noit_atomic64_t curr) {
@@ -87 +86 @@
-#endif
-
+static inline void noit_spinlock_lock(volatile noit_spinlock_t *lock) {
+  while(noit_atomic_cas32(lock, 1, 0) != 0);
+}
+static inline void noit_spinlock_unlock(volatile noit_spinlock_t *lock) {
+  while(noit_atomic_cas32(lock, 0, 1) != 1);
+}
+static inline noit_spinlock_trylock(volatile noit_spinlock_t *lock) {
+  return (noit_atomic_cas32(lock, 1, 0) == 0);
+}
+
-#else
-#error Please stub out the atomics section for your platform