aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-03-07 22:23:23 +0000
committerUlrich Drepper <drepper@redhat.com>2003-03-07 22:23:23 +0000
commit35457070d26e3ac6f0132e993bfea1bff3fef977 (patch)
tree04117df70cca04d4eba685d1e431c68d26ec9460 /linuxthreads/sysdeps
parentb6b9ee9bcb357dda75515ef04430b05d79491f09 (diff)
downloadglibc-35457070d26e3ac6f0132e993bfea1bff3fef977.tar
glibc-35457070d26e3ac6f0132e993bfea1bff3fef977.tar.gz
glibc-35457070d26e3ac6f0132e993bfea1bff3fef977.tar.bz2
glibc-35457070d26e3ac6f0132e993bfea1bff3fef977.zip
Update.
* rt/tst-aio7.c (do_test): Give buff permanent extend, too.
Diffstat (limited to 'linuxthreads/sysdeps')
-rw-r--r--linuxthreads/sysdeps/ia64/pspinlock.c38
1 files changed, 12 insertions, 26 deletions
diff --git a/linuxthreads/sysdeps/ia64/pspinlock.c b/linuxthreads/sysdeps/ia64/pspinlock.c
index e3aeea60cb..14c7f3a181 100644
--- a/linuxthreads/sysdeps/ia64/pspinlock.c
+++ b/linuxthreads/sysdeps/ia64/pspinlock.c
@@ -1,5 +1,5 @@
/* POSIX spinlock implementation. ia64 version.
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jes Sorensen <jes@linuxcare.com>
@@ -21,6 +21,7 @@
#include <errno.h>
#include <pthread.h>
#include "internals.h"
+#include <ia64intrin.h>
/* This implementation is inspired by the implementation used in the
Linux kernel. */
@@ -28,21 +29,15 @@
int
__pthread_spin_lock (pthread_spinlock_t *lock)
{
- asm volatile
- ("mov ar.ccv = r0\n\t"
- "mov r3 = 1\n\t"
- ";;\n"
- "1:\n\t"
- "ld4 r2 = %0\n\t"
- ";;\n\t"
- "cmp4.eq p0, p7 = r0, r2\n\t"
- "(p7) br.cond.spnt.few 1b \n\t"
- "cmpxchg4.acq r2 = %0, r3, ar.ccv\n\t"
- ";;\n\t"
- "cmp4.eq p0, p7 = r0, r2\n\t"
- "(p7) br.cond.spnt.few 1b\n\t"
- ";;\n"
- :: "m" (lock) : "r2", "r3", "p7", "memory");
+ int *p = (int *) lock;
+
+ while (__builtin_expect (__sync_val_compare_and_swap_si (p, 0, 1), 0))
+ {
+ /* Spin without using the atomic instruction. */
+ do
+ __asm __volatile ("" : : : "memory");
+ while (*p);
+ }
return 0;
}
weak_alias (__pthread_spin_lock, pthread_spin_lock)
@@ -51,16 +46,7 @@ weak_alias (__pthread_spin_lock, pthread_spin_lock)
int
__pthread_spin_trylock (pthread_spinlock_t *lock)
{
- int oldval;
-
- asm volatile
- ("mov ar.ccv = r0\n\t"
- "mov r2 = 1\n\t"
- ";;\n\t"
- "cmpxchg4.acq %0 = %1, r2, ar.ccv\n\t"
- ";;\n"
- : "=r" (oldval) : "m" (lock) : "r2", "memory");
- return oldval > 0 ? 0 : EBUSY;
+ return __sync_val_compare_and_swap_si ((int *) lock, 0, 1) == 0 ? 0 : EBUSY;
}
weak_alias (__pthread_spin_trylock, pthread_spin_trylock)