diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-09-08 06:09:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-09-08 06:09:02 +0000 |
| commit | 7ba0e52c39ae2a57933a856ce363ab0361ad1ed9 (patch) | |
| tree | aaabd4f3d63a9a27d7c8f4fb1105bcc3c5ef26a2 /nptl | |
| parent | f510d815bec80c004b194aaf4847fa40069cfd18 (diff) | |
Update.
* sysdeps/powerpc/bits/atomic.h (atomic_increment): Define.
(atomic_decrement): Define.
* sysdeps/powerpc/bits/atomic.h: Implement atomic_increment_val and
atomic_decrement_val.
* sysdeps/powerpc/powerpc32/bits/atomic.h: Likewise.
* sysdeps/powerpc/powerpc64/bits/atomic.h: Likewise.
* csu/tst-atomic.c (do_test): Add tests of atomic_increment_val
and atomic_decrement_val.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/allocatestack.c | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_barrier_wait.c | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sem_post.c | 7 |
4 files changed, 8 insertions, 11 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 33fbbaa850..59f00d9231 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -445,8 +445,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, #if COLORING_INCREMENT != 0 /* Atomically increment NCREATED. */ - unsigned int ncreated = (atomic_exchange_and_add (&nptl_ncreated, 1) - + 1); + unsigned int ncreated = atomic_increment_val (&nptl_ncreated); /* We chose the offset for coloring by incrementing it for every new thread by a fixed amount. The offset used diff --git a/nptl/sysdeps/pthread/pthread_barrier_wait.c b/nptl/sysdeps/pthread/pthread_barrier_wait.c index aa5b42d419..c6b563f242 100644 --- a/nptl/sysdeps/pthread/pthread_barrier_wait.c +++ b/nptl/sysdeps/pthread/pthread_barrier_wait.c @@ -69,7 +69,7 @@ pthread_barrier_wait (barrier) unsigned int init_count = ibarrier->init_count; /* If this was the last woken thread, unlock. */ - if (atomic_exchange_and_add (&ibarrier->left, 1) == init_count - 1) + if (atomic_increment_val (&ibarrier->left) == init_count) /* We are done. */ lll_unlock (ibarrier->lock); diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c b/nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c index d9ee5d50b7..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 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. @@ -30,11 +30,10 @@ int __new_sem_post (sem_t *sem) { int *futex = (int *) sem; - int err, nr; __asm __volatile (__lll_rel_instr ::: "memory"); - nr = atomic_exchange_and_add (futex, 1); - err = lll_futex_wake (futex, nr + 1); + int nr = atomic_increment_val (futex); + int err = lll_futex_wake (futex, nr); if (__builtin_expect (err, 0) < 0) { __set_errno (-err); diff --git a/nptl/sysdeps/unix/sysv/linux/sem_post.c b/nptl/sysdeps/unix/sysv/linux/sem_post.c index b4ee4cfc8a..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 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. @@ -30,10 +30,9 @@ int __new_sem_post (sem_t *sem) { int *futex = (int *) sem; - int err, nr; - nr = atomic_exchange_and_add (futex, 1); - err = lll_futex_wake (futex, nr + 1); + int nr = atomic_increment_val (futex); + int err = lll_futex_wake (futex, nr); if (__builtin_expect (err, 0) < 0) { __set_errno (-err); |