diff options
Diffstat (limited to 'nptl/sysdeps/unix')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c | 14 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sem_post.c | 14 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c | 13 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S | 9 |
5 files changed, 22 insertions, 35 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S index 2813c20ef8..71e96d2228 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_post.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -44,12 +44,9 @@ __new_sem_post: LOCK xaddl %edx, (%ebx) - testl %edx, %edx - jne 2f - movl $SYS_futex, %eax movl $FUTEX_WAKE, %ecx - movl $1, %edx + addl $1, %edx ENTER_KERNEL testl %eax, %eax diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c index 86dd0ebb3b..91b9955181 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c @@ -1,5 +1,5 @@ /* sem_post -- post to a POSIX semaphore. Powerpc version. - Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003. @@ -32,14 +32,12 @@ __new_sem_post (sem_t *sem) int *futex = (int *) sem; __asm __volatile (__lll_rel_instr ::: "memory"); - if (atomic_increment_val (futex) == 1) + int nr = atomic_increment_val (futex); + int err = lll_futex_wake (futex, nr); + if (__builtin_expect (err, 0) < 0) { - int err = lll_futex_wake (futex, 1); - if (__builtin_expect (err, 0) < 0) - { - __set_errno (-err); - return -1; - } + __set_errno (-err); + return -1; } return 0; } diff --git a/nptl/sysdeps/unix/sysv/linux/sem_post.c b/nptl/sysdeps/unix/sysv/linux/sem_post.c index 641ce661a1..671b43f7f7 100644 --- a/nptl/sysdeps/unix/sysv/linux/sem_post.c +++ b/nptl/sysdeps/unix/sysv/linux/sem_post.c @@ -1,5 +1,5 @@ /* sem_post -- post to a POSIX semaphore. Generic futex-using version. - Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. @@ -31,14 +31,12 @@ __new_sem_post (sem_t *sem) { int *futex = (int *) sem; - if (atomic_increment_val (futex) == 1) + int nr = atomic_increment_val (futex); + int err = lll_futex_wake (futex, nr); + if (__builtin_expect (err, 0) < 0) { - int err = lll_futex_wake (futex, 1); - if (__builtin_expect (err, 0) < 0) - { - __set_errno (-err); - return -1; - } + __set_errno (-err); + return -1; } return 0; } diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c index ba77aa90bd..be1cc60b11 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sem_post.c @@ -1,5 +1,5 @@ /* sem_post -- post to a POSIX semaphore. SPARC version. - Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. @@ -39,14 +39,11 @@ __new_sem_post (sem_t *sem) nr = ++*futex; __sparc32_atomic_do_unlock24 (futex + 1); } - if (nr == 1) + int err = lll_futex_wake (futex, nr); + if (__builtin_expect (err, 0) < 0) { - int err = lll_futex_wake (futex, 1); - if (__builtin_expect (err, 0) < 0) - { - __set_errno (-err); - return -1; - } + __set_errno (-err); + return -1; } return 0; } diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S index cc3a9a9cee..7f608a5974 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sem_post.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -41,18 +41,15 @@ sem_post: LOCK xaddl %edx, (%rdi) - testl %edx, %edx - jne 2f - movl $SYS_futex, %eax movl $FUTEX_WAKE, %esi - movl $1, %edx + incl %edx syscall testq %rax, %rax js 1f -2: xorl %eax, %eax + xorl %eax, %eax retq 1: |