revert some more spin optimizations that turned out to be pessimizations

diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 93c94867868801c4d4df7dd8d3e9fb0f90648b18..c0948255fc176c6305e222f8209b027f44bead8a 100644 (file)
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -13,7 +13,7 @@ void __lockfile(FILE *f)
                f->lockcount++;
                return;
        }
-       while (f->lock || a_cas(&f->lock, 0, tid))
+       while (a_cas(&f->lock, 0, tid))
                if (spins) spins--, a_spin();
                else syscall(SYS_sched_yield);
        f->lockcount = 1;

diff --git a/src/thread/pthread_spin_lock.c b/src/thread/pthread_spin_lock.c
index 59fa6ea89ad2e322f0071724c7ab09275a4a3258..0ab3d64fdaed9b831c08bf90ed32e571ab2c400a 100644 (file)
--- 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 1fc5f73c174ec890da1457bb8bd776f9e1fb3bc2..c12696b3010b332706d203faa7e16cad62433bca 100644 (file)
--- 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;
 }