aboutsummaryrefslogtreecommitdiff
path: root/bits
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-22 23:01:01 +0000
committerRoland McGrath <roland@gnu.org>2003-03-22 23:01:01 +0000
commitd15851ec24d31ccf3ee9a4a388104974d1f494dc (patch)
tree6ad9a310067d563e20b58cd275fac04cdea53c04 /bits
parent38ed16cf8860812f4f18d19a69fc031ab9da1156 (diff)
downloadglibc-d15851ec24d31ccf3ee9a4a388104974d1f494dc.zip
glibc-d15851ec24d31ccf3ee9a4a388104974d1f494dc.tar.gz
glibc-d15851ec24d31ccf3ee9a4a388104974d1f494dc.tar.bz2
* include/atomic.h (atomic_increment_and_test): Invert sense of test.
Add comment. (atomic_decrement_and_test): Add comment. 2003-03-22 Jakub Jelinek <jakub@redhat.com> * include/atomic.h (atomic_compare_and_exchange_val_acq): Add comment. Don't define if __arch_compare_and_exchange_val_32_acq is not defined. (atomic_compare_and_exchange_bool_acq): Add comment. Don't use __oldval variable in the macro, since it might be macro argument. (atomic_decrement_if_positive): Initialize __memp, remove setting of non-existent variable. (atomic_bit_test_set): Cast 1 to __typeof (*mem) before shifting. * sysdeps/ia64/bits/atomic.h (atomic_exchange_and_add): Implement using atomic_compare_and_exchange_val_acq. (atomic_decrement_if_positive, atomic_bit_test_set): Define. * sysdeps/s390/bits/atomic.h (__arch_compare_and_exchange_val_8_acq): Renamed from... (__arch_compare_and_exchange_bool_8_acq): ... this. (__arch_compare_and_exchange_val_16_acq): Renamed from... (__arch_compare_and_exchange_bool_16_acq): ... this. (__arch_compare_and_exchange_val_32_acq): Return old value. Renamed from... (__arch_compare_and_exchange_bool_32_acq): ... this. (__arch_compare_and_exchange_val_64_acq): Return old value. Renamed from... (__arch_compare_and_exchange_bool_64_acq): ... this. (__arch_compare_and_exchange_val_32_acq): Use __typeof for local variables types instead of assuming int. Change prefix of local variables to __arch. * sysdeps/generic/bits/atomic.h (arch_compare_and_exchange_acq): Remove. (atomic_compare_and_exchange_val_acq, atomic_compare_and_exchange_bool_acq): Define. * csu/tst-atomic.c: New test. * csu/tst-atomic-long.c: New test. * csu/Makefile (tests): Add tst-atomic and tst-atomic-long. * malloc/memusagestat.c (main): Kill warning if uint64_t is ulong. * sysdeps/s390/Versions: Add trailing newline. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Kill warning if INTERNAL_SYSCALL_ERROR_P doesn't use its first argument.
Diffstat (limited to 'bits')
-rw-r--r--bits/atomic.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/bits/atomic.h b/bits/atomic.h
index 7595b40..6245130 100644
--- a/bits/atomic.h
+++ b/bits/atomic.h
@@ -25,7 +25,19 @@
up with real definitions. */
/* The only basic operation needed is compare and exchange. */
-#define arch_compare_and_exchange_acq(mem, newval, oldval) \
- ({ *(mem) == (oldval) ? 1 : (*(mem) = (newval), 0); })
+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
+ ({ __typeof (mem) __gmemp = (mem); \
+ __typeof (*mem) __gret = *__gmemp; \
+ __typeof (*mem) __gnewval = (newval); \
+ \
+ if (__gret == (oldval)) \
+ *__gmemp = __gnewval; \
+ __gret; })
+
+#define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
+ ({ __typeof (mem) __gmemp = (mem); \
+ __typeof (*mem) __gnewval = (newval); \
+ \
+ *__gmemp == (oldval) ? (*__gmemp = __gnewval, 0) : 1; })
#endif /* bits/atomic.h */