From 4106cdcd2de34bf3b9839e042344d92eae887ecb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 28 Mar 2011 22:36:55 -0400 Subject: revert some more spin optimizations that turned out to be pessimizations --- src/thread/pthread_spin_lock.c | 2 +- src/thread/pthread_spin_trylock.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/thread') diff --git a/src/thread/pthread_spin_lock.c b/src/thread/pthread_spin_lock.c index 59fa6ea8..0ab3d64f 100644 --- a/src/thread/pthread_spin_lock.c +++ b/src/thread/pthread_spin_lock.c @@ -2,6 +2,6 @@ int pthread_spin_lock(pthread_spinlock_t *s) { - while (a_xchg(s, 1)); + while (a_xchg(s, 1)) a_spin(); return 0; } diff --git a/src/thread/pthread_spin_trylock.c b/src/thread/pthread_spin_trylock.c index 1fc5f73c..c12696b3 100644 --- a/src/thread/pthread_spin_trylock.c +++ b/src/thread/pthread_spin_trylock.c @@ -2,6 +2,5 @@ int pthread_spin_trylock(pthread_spinlock_t *s) { - if (*s || a_xchg(s, 1)) return EBUSY; - return 0; + return -a_xchg(s, 1) & EBUSY; } -- cgit v1.2.1