revert mutex "optimization" that turned out to be worse
authorRich Felker <dalias@aerifal.cx>
Tue, 29 Mar 2011 19:11:25 +0000 (15:11 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 29 Mar 2011 19:11:25 +0000 (15:11 -0400)
src/thread/pthread_mutex_trylock.c

index 232e172b6e0f5fcd1ee1b9d10df3e1694317f6e5..50a815a5fbf4dc22322347fa2ab4aaaeb98348b2 100644 (file)
@@ -7,7 +7,7 @@ int pthread_mutex_trylock(pthread_mutex_t *m)
        pthread_t self;
 
        if (m->_m_type == PTHREAD_MUTEX_NORMAL)
-               return (m->_m_lock || a_swap(&m->_m_lock, 1)) ? EBUSY : 0;
+               return -a_swap(&m->_m_lock, 1) & EBUSY;
 
        self = pthread_self();
        tid = self->tid | 0x80000000;