revert some more spin optimizations that turned out to be pessimizations

This commit is contained in:
Rich Felker
2011-03-28 22:36:55 -04:00
parent 4cc78719dd
commit 4106cdcd2d
3 changed files with 3 additions and 4 deletions

View File

@ -13,7 +13,7 @@ void __lockfile(FILE *f)
f->lockcount++; f->lockcount++;
return; return;
} }
while (f->lock || a_cas(&f->lock, 0, tid)) while (a_cas(&f->lock, 0, tid))
if (spins) spins--, a_spin(); if (spins) spins--, a_spin();
else syscall(SYS_sched_yield); else syscall(SYS_sched_yield);
f->lockcount = 1; f->lockcount = 1;

View File

@ -2,6 +2,6 @@
int pthread_spin_lock(pthread_spinlock_t *s) int pthread_spin_lock(pthread_spinlock_t *s)
{ {
while (a_xchg(s, 1)); while (a_xchg(s, 1)) a_spin();
return 0; return 0;
} }

View File

@ -2,6 +2,5 @@
int pthread_spin_trylock(pthread_spinlock_t *s) int pthread_spin_trylock(pthread_spinlock_t *s)
{ {
if (*s || a_xchg(s, 1)) return EBUSY; return -a_xchg(s, 1) & EBUSY;
return 0;
} }