diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-21 07:40:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-21 07:40:24 +0000 |
| commit | 71451de2f1245b21ce3ba407068c453a866c03d6 (patch) | |
| tree | 6646149e32cd4e762f758fa4796a62aab0ea8adf /nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S | |
| parent | 56a4aa9886dc1145f8feac66b66216a44cb092c1 (diff) | |
| download | glibc-71451de2f1245b21ce3ba407068c453a866c03d6.tar.gz glibc-71451de2f1245b21ce3ba407068c453a866c03d6.tar.xz glibc-71451de2f1245b21ce3ba407068c453a866c03d6.zip | |
Update.
2003-09-21 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Completely revamp the locking macros. No distinction between normal and mutex locking anymore. * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Rewrite mutex locking. Merge bits from lowlevelmutex.S we still need. * sysdeps/unix/sysv/linux/i386/i486/lowlevelmutex.S: Removed. * Makefile (routines): Remove libc-lowlevelmutex. (libpthread-rountines): Remove lowlevelmutex. * pthread_barrier_wait.S: Adjust for new mutex implementation. * pthread_cond_broadcast.S: Likewise. * pthread_cond_timedwait.S: Likewise. * pthread_cond_wait.S: Likewise. * pthread_rwlock_rdlock.S: Likewise. * pthread_rwlock_timedrdlock.S: Likewise. * pthread_rwlock_timedwrlock.S: Likewise. * pthread_rwlock_unlock.S: Likewise. * pthread_rwlock_wrlock.S: Likewise. * pthread_cond_signal.S: Likewise. Don't use requeue.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S index c9b3d8b7bc..08c6e915b9 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S @@ -42,9 +42,11 @@ pthread_barrier_wait: movl 8(%esp), %ebx /* Get the mutex. */ - orl $-1, %eax + movl $1, %edx + xorl %eax, %eax LOCK - xaddl %eax, MUTEX(%ebx) + cmpxchgl %edx, MUTEX(%ebx) + testl %eax, %eax jne 1f /* One less waiter. If this was the last one needed wake @@ -63,8 +65,8 @@ pthread_barrier_wait: /* Release the mutex. */ LOCK - addl $1, MUTEX(%ebx) - jng 6f + subl $1, MUTEX(%ebx) + jne 6f /* Wait for the remaining threads. The call will return immediately if the CURR_EVENT memory has meanwhile been changed. */ @@ -110,8 +112,8 @@ pthread_barrier_wait: waking the waiting threads since otherwise a new thread might arrive and gets waken up, too. */ LOCK - addl $1, MUTEX(%ebx) - jng 4f + subl $1, MUTEX(%ebx) + jne 4f 5: orl $-1, %eax /* == PTHREAD_BARRIER_SERIAL_THREAD */ @@ -119,14 +121,14 @@ pthread_barrier_wait: ret 1: leal MUTEX(%ebx), %ecx - call __lll_lock_wait + call __lll_mutex_lock_wait jmp 2b 4: leal MUTEX(%ebx), %eax - call __lll_unlock_wake + call __lll_mutex_unlock_wake jmp 5b 6: leal MUTEX(%ebx), %eax - call __lll_unlock_wake + call __lll_mutex_unlock_wake jmp 7b .size pthread_barrier_wait,.-pthread_barrier_wait |