Skip to content

Commit f09a0f5

Browse files
author
Kim Barrett
committed
8307806: Rename Atomic::fetch_and_add and friends
Reviewed-by: stefank, dholmes
1 parent b6bcbc0 commit f09a0f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+165
-165
lines changed

‎src/hotspot/os/bsd/os_bsd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2077,7 +2077,7 @@ uint os::processor_id() {
20772077
// Assign processor id to APIC id
20782078
processor_id = Atomic::cmpxchg(&processor_id_map[apic_id], processor_id_unassigned, processor_id_assigning);
20792079
if (processor_id == processor_id_unassigned) {
2080-
processor_id = Atomic::fetch_and_add(&processor_id_next, 1) % os::processor_count();
2080+
processor_id = Atomic::fetch_then_add(&processor_id_next, 1) % os::processor_count();
20812081
Atomic::store(&processor_id_map[apic_id], processor_id);
20822082
}
20832083
}

‎src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -95,17 +95,17 @@ inline void post_membar(atomic_memory_order order) {
9595
template<size_t byte_size>
9696
struct Atomic::PlatformAdd {
9797
template<typename D, typename I>
98-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
98+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
9999

100100
template<typename D, typename I>
101-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
102-
return add_and_fetch(dest, add_value, order) - add_value;
101+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
102+
return add_then_fetch(dest, add_value, order) - add_value;
103103
}
104104
};
105105

106106
template<>
107107
template<typename D, typename I>
108-
inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
108+
inline D Atomic::PlatformAdd<4>::add_then_fetch(D volatile* dest, I add_value,
109109
atomic_memory_order order) const {
110110
STATIC_ASSERT(4 == sizeof(I));
111111
STATIC_ASSERT(4 == sizeof(D));
@@ -131,7 +131,7 @@ inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
131131

132132
template<>
133133
template<typename D, typename I>
134-
inline D Atomic::PlatformAdd<8>::add_and_fetch(D volatile* dest, I add_value,
134+
inline D Atomic::PlatformAdd<8>::add_then_fetch(D volatile* dest, I add_value,
135135
atomic_memory_order order) const {
136136
STATIC_ASSERT(8 == sizeof(I));
137137
STATIC_ASSERT(8 == sizeof(D));

‎src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
template<size_t byte_size>
3737
struct Atomic::PlatformAdd {
3838
template<typename D, typename I>
39-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
39+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
4040
if (order == memory_order_relaxed) {
4141
return __atomic_add_fetch(dest, add_value, __ATOMIC_RELAXED);
4242
} else {
@@ -47,8 +47,8 @@ struct Atomic::PlatformAdd {
4747
}
4848

4949
template<typename D, typename I>
50-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
51-
return add_and_fetch(dest, add_value, order) - add_value;
50+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
51+
return add_then_fetch(dest, add_value, order) - add_value;
5252
}
5353
};
5454

‎src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -30,18 +30,18 @@
3030
template<size_t byte_size>
3131
struct Atomic::PlatformAdd {
3232
template<typename D, typename I>
33-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order /* order */) const;
33+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order /* order */) const;
3434

3535
template<typename D, typename I>
36-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
37-
return fetch_and_add(dest, add_value, order) + add_value;
36+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
37+
return fetch_then_add(dest, add_value, order) + add_value;
3838
}
3939
};
4040

4141
template<>
4242
template<typename D, typename I>
43-
inline D Atomic::PlatformAdd<4>::fetch_and_add(D volatile* dest, I add_value,
44-
atomic_memory_order /* order */) const {
43+
inline D Atomic::PlatformAdd<4>::fetch_then_add(D volatile* dest, I add_value,
44+
atomic_memory_order /* order */) const {
4545
STATIC_ASSERT(4 == sizeof(I));
4646
STATIC_ASSERT(4 == sizeof(D));
4747
D old_value;
@@ -96,8 +96,8 @@ inline T Atomic::PlatformCmpxchg<4>::operator()(T volatile* dest,
9696
#ifdef AMD64
9797
template<>
9898
template<typename D, typename I>
99-
inline D Atomic::PlatformAdd<8>::fetch_and_add(D volatile* dest, I add_value,
100-
atomic_memory_order /* order */) const {
99+
inline D Atomic::PlatformAdd<8>::fetch_then_add(D volatile* dest, I add_value,
100+
atomic_memory_order /* order */) const {
101101
STATIC_ASSERT(8 == sizeof(I));
102102
STATIC_ASSERT(8 == sizeof(D));
103103
D old_value;

‎src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -75,7 +75,7 @@ static inline int m68k_compare_and_swap(int newval,
7575
}
7676

7777
/* Atomically add an int to memory. */
78-
static inline int m68k_add_and_fetch(int add_value, volatile int *ptr) {
78+
static inline int m68k_add_then_fetch(int add_value, volatile int *ptr) {
7979
for (;;) {
8080
// Loop until success.
8181

@@ -136,7 +136,7 @@ static inline int arm_compare_and_swap(int newval,
136136
}
137137

138138
/* Atomically add an int to memory. */
139-
static inline int arm_add_and_fetch(int add_value, volatile int *ptr) {
139+
static inline int arm_add_then_fetch(int add_value, volatile int *ptr) {
140140
for (;;) {
141141
// Loop until a __kernel_cmpxchg succeeds.
142142

@@ -163,26 +163,26 @@ static inline int arm_lock_test_and_set(int newval, volatile int *ptr) {
163163
template<size_t byte_size>
164164
struct Atomic::PlatformAdd {
165165
template<typename D, typename I>
166-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
166+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
167167

168168
template<typename D, typename I>
169-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
170-
return add_and_fetch(dest, add_value, order) - add_value;
169+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
170+
return add_then_fetch(dest, add_value, order) - add_value;
171171
}
172172
};
173173

174174
template<>
175175
template<typename D, typename I>
176-
inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
177-
atomic_memory_order order) const {
176+
inline D Atomic::PlatformAdd<4>::add_then_fetch(D volatile* dest, I add_value,
177+
atomic_memory_order order) const {
178178
STATIC_ASSERT(4 == sizeof(I));
179179
STATIC_ASSERT(4 == sizeof(D));
180180

181181
#ifdef ARM
182-
return add_using_helper<int>(arm_add_and_fetch, dest, add_value);
182+
return add_using_helper<int>(arm_add_then_fetch, dest, add_value);
183183
#else
184184
#ifdef M68K
185-
return add_using_helper<int>(m68k_add_and_fetch, dest, add_value);
185+
return add_using_helper<int>(m68k_add_then_fetch, dest, add_value);
186186
#else
187187
D res = __atomic_add_fetch(dest, add_value, __ATOMIC_RELEASE);
188188
FULL_MEM_BARRIER;
@@ -193,8 +193,8 @@ inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
193193

194194
template<>
195195
template<typename D, typename I>
196-
inline D Atomic::PlatformAdd<8>::add_and_fetch(D volatile* dest, I add_value,
197-
atomic_memory_order order) const {
196+
inline D Atomic::PlatformAdd<8>::add_then_fetch(D volatile* dest, I add_value,
197+
atomic_memory_order order) const {
198198
STATIC_ASSERT(8 == sizeof(I));
199199
STATIC_ASSERT(8 == sizeof(D));
200200

‎src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -72,19 +72,19 @@ inline D atomic_fastcall(F stub, volatile D *dest, T1 arg1, T2 arg2) {
7272
template<size_t byte_size>
7373
struct Atomic::PlatformAdd {
7474
template<typename D, typename I>
75-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const;
75+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const;
7676

7777
template<typename D, typename I>
78-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
79-
D value = fetch_and_add(dest, add_value, order) + add_value;
78+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
79+
D value = fetch_then_add(dest, add_value, order) + add_value;
8080
return value;
8181
}
8282
};
8383

8484
template<>
8585
template<typename D, typename I>
86-
inline D Atomic::PlatformAdd<4>::fetch_and_add(D volatile* dest, I add_value,
87-
atomic_memory_order order) const {
86+
inline D Atomic::PlatformAdd<4>::fetch_then_add(D volatile* dest, I add_value,
87+
atomic_memory_order order) const {
8888
STATIC_ASSERT(4 == sizeof(I));
8989
STATIC_ASSERT(4 == sizeof(D));
9090
aarch64_atomic_stub_t stub;
@@ -99,8 +99,8 @@ inline D Atomic::PlatformAdd<4>::fetch_and_add(D volatile* dest, I add_value,
9999

100100
template<>
101101
template<typename D, typename I>
102-
inline D Atomic::PlatformAdd<8>::fetch_and_add(D volatile* dest, I add_value,
103-
atomic_memory_order order) const {
102+
inline D Atomic::PlatformAdd<8>::fetch_then_add(D volatile* dest, I add_value,
103+
atomic_memory_order order) const {
104104
STATIC_ASSERT(8 == sizeof(I));
105105
STATIC_ASSERT(8 == sizeof(D));
106106
aarch64_atomic_stub_t stub;

‎src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -101,17 +101,17 @@ inline void Atomic::PlatformStore<8>::operator()(T volatile* dest,
101101
template<size_t byte_size>
102102
struct Atomic::PlatformAdd {
103103
template<typename D, typename I>
104-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
104+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
105105

106106
template<typename D, typename I>
107-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
108-
return add_and_fetch(dest, add_value, order) - add_value;
107+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
108+
return add_then_fetch(dest, add_value, order) - add_value;
109109
}
110110
};
111111

112112
template<>
113113
template<typename D, typename I>
114-
inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
114+
inline D Atomic::PlatformAdd<4>::add_then_fetch(D volatile* dest, I add_value,
115115
atomic_memory_order order) const {
116116
STATIC_ASSERT(4 == sizeof(I));
117117
STATIC_ASSERT(4 == sizeof(D));

‎src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2012, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -95,18 +95,18 @@ inline void post_membar(atomic_memory_order order) {
9595
template<size_t byte_size>
9696
struct Atomic::PlatformAdd {
9797
template<typename D, typename I>
98-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
98+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
9999

100100
template<typename D, typename I>
101-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
102-
return add_and_fetch(dest, add_value, order) - add_value;
101+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
102+
return add_then_fetch(dest, add_value, order) - add_value;
103103
}
104104
};
105105

106106
template<>
107107
template<typename D, typename I>
108-
inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
109-
atomic_memory_order order) const {
108+
inline D Atomic::PlatformAdd<4>::add_then_fetch(D volatile* dest, I add_value,
109+
atomic_memory_order order) const {
110110
STATIC_ASSERT(4 == sizeof(I));
111111
STATIC_ASSERT(4 == sizeof(D));
112112

@@ -131,8 +131,8 @@ inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I add_value,
131131

132132
template<>
133133
template<typename D, typename I>
134-
inline D Atomic::PlatformAdd<8>::add_and_fetch(D volatile* dest, I add_value,
135-
atomic_memory_order order) const {
134+
inline D Atomic::PlatformAdd<8>::add_then_fetch(D volatile* dest, I add_value,
135+
atomic_memory_order order) const {
136136
STATIC_ASSERT(8 == sizeof(I));
137137
STATIC_ASSERT(8 == sizeof(D));
138138

‎src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -36,7 +36,7 @@
3636
template<size_t byte_size>
3737
struct Atomic::PlatformAdd {
3838
template<typename D, typename I>
39-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
39+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const {
4040
if (order != memory_order_relaxed) {
4141
FULL_MEM_BARRIER;
4242
}
@@ -50,8 +50,8 @@ struct Atomic::PlatformAdd {
5050
}
5151

5252
template<typename D, typename I>
53-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
54-
return add_and_fetch(dest, add_value, order) - add_value;
53+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
54+
return add_then_fetch(dest, add_value, order) - add_value;
5555
}
5656
};
5757

‎src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2016, 2019 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -77,18 +77,18 @@ inline void z196_fast_sync() {
7777
template<size_t byte_size>
7878
struct Atomic::PlatformAdd {
7979
template<typename D, typename I>
80-
D add_and_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
80+
D add_then_fetch(D volatile* dest, I add_value, atomic_memory_order order) const;
8181

8282
template<typename D, typename I>
83-
D fetch_and_add(D volatile* dest, I add_value, atomic_memory_order order) const {
84-
return add_and_fetch(dest, add_value, order) - add_value;
83+
D fetch_then_add(D volatile* dest, I add_value, atomic_memory_order order) const {
84+
return add_then_fetch(dest, add_value, order) - add_value;
8585
}
8686
};
8787

8888
template<>
8989
template<typename D, typename I>
90-
inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I inc,
91-
atomic_memory_order order) const {
90+
inline D Atomic::PlatformAdd<4>::add_then_fetch(D volatile* dest, I inc,
91+
atomic_memory_order order) const {
9292
STATIC_ASSERT(4 == sizeof(I));
9393
STATIC_ASSERT(4 == sizeof(D));
9494

@@ -141,8 +141,8 @@ inline D Atomic::PlatformAdd<4>::add_and_fetch(D volatile* dest, I inc,
141141

142142
template<>
143143
template<typename D, typename I>
144-
inline D Atomic::PlatformAdd<8>::add_and_fetch(D volatile* dest, I inc,
145-
atomic_memory_order order) const {
144+
inline D Atomic::PlatformAdd<8>::add_then_fetch(D volatile* dest, I inc,
145+
atomic_memory_order order) const {
146146
STATIC_ASSERT(8 == sizeof(I));
147147
STATIC_ASSERT(8 == sizeof(D));
148148

0 commit comments

Comments
 (0)