diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2014-06-03 21:43:27 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2014-06-03 21:43:27 +0400 |
| commit | bd30f9451a3f775e7db30a9c405e4db9d4c259b8 (patch) | |
| tree | 9700f1cc1c1a12c658e51176dd928a2a675d6a21 /accel-pppd/triton/spinlock.h | |
| parent | 093c53e3e08abb609cae6e58b1b438616c57c17f (diff) | |
| download | accel-ppp-bd30f9451a3f775e7db30a9c405e4db9d4c259b8.tar.gz accel-ppp-bd30f9451a3f775e7db30a9c405e4db9d4c259b8.zip | |
get out of SPINLOCK_INITIALIZER as it is not cross-platform compatible
Diffstat (limited to 'accel-pppd/triton/spinlock.h')
| -rw-r--r-- | accel-pppd/triton/spinlock.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/accel-pppd/triton/spinlock.h b/accel-pppd/triton/spinlock.h index b09d8276..529719ed 100644 --- a/accel-pppd/triton/spinlock.h +++ b/accel-pppd/triton/spinlock.h @@ -1,26 +1,7 @@ #ifndef __TRITON_SPINLOCK_H #define __TRITON_SPINLOCK_H -#if defined(FUTEX_SPINLOCK) - -/*#include <unistd.h> -#include <sys/syscall.h> -#include <linux/futex.h> -typedef volatile int __attribute__((aligned)) spinlock_t; -static inline void _spin_lock(spinlock_t *l) -{ - syscall(SYS_futex, l, FUTEX_WAIT, r, NULL, NULL, 0); -} -static inline void _spin_unlock(spinlock_t *l) -{ - syscall(SYS_futex, l, FUTEX_WAKE, 2, NULL, NULL, 0); -} -#define spin_lock(l) _spin_lock(l) -#define spin_unlock(l) _spin_unlock(l) -#define SPINLOCK_INITIALIZER 1 -#define spinlock_init(l) {*(l)=1;}*/ - -#elif defined(GCC_SPINLOCK) +#if defined(GCC_SPINLOCK) typedef volatile int __attribute__((aligned)) spinlock_t; #define spin_lock(l) {while(__sync_lock_test_and_set(l,1));} @@ -34,7 +15,6 @@ typedef volatile int __attribute__((aligned)) spinlock_t; typedef pthread_spinlock_t spinlock_t; #define spin_lock(l) pthread_spin_lock(l) #define spin_unlock(l) pthread_spin_unlock(l) -#define SPINLOCK_INITIALIZER 1 #define spinlock_init(l) pthread_spin_init(l, 0) #endif |