Skip to content

Commit 8352685

Browse files
committed
rename relaxed_store => store_relaxed
1 parent 2e3d7d4 commit 8352685

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

src/hotspot/share/gc/shared/freeListAllocator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ size_t FreeListAllocator::PendingList::add(FreeNode* node) {
5353

5454
typename FreeListAllocator::NodeList FreeListAllocator::PendingList::take_all() {
5555
NodeList result{_head.load_relaxed(), _tail, _count.load_relaxed()};
56-
_head.relaxed_store(nullptr);
56+
_head.store_relaxed(nullptr);
5757
_tail = nullptr;
58-
_count.relaxed_store(0u);
58+
_count.store_relaxed(0u);
5959
return result;
6060
}
6161

@@ -96,7 +96,7 @@ void FreeListAllocator::reset() {
9696
uint index = _active_pending_list.load_relaxed();
9797
_pending_lists[index].take_all();
9898
_free_list.pop_all();
99-
_free_count.relaxed_store(0u);
99+
_free_count.store_relaxed(0u);
100100
}
101101

102102
size_t FreeListAllocator::free_count() const {

src/hotspot/share/gc/shared/freeListAllocator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class FreeListAllocator {
7070

7171
Atomic<FreeNode*>* next_addr() { return &_next; }
7272

73-
void set_next(FreeNode* next) { _next.relaxed_store(next); }
73+
void set_next(FreeNode* next) { _next.store_relaxed(next); }
7474
};
7575

7676
struct NodeList {

src/hotspot/share/gc/shared/stringdedup/stringDedupTable.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ void StringDedup::Table::num_dead_callback(size_t num_dead) {
245245

246246
switch (_dead_state.load_relaxed()) {
247247
case DeadState::good:
248-
_dead_count.relaxed_store(num_dead);
248+
_dead_count.store_relaxed(num_dead);
249249
break;
250250

251251
case DeadState::wait1:
252252
// Set count first, so dedup thread gets this or a later value if it
253253
// sees the good state.
254-
_dead_count.relaxed_store(num_dead);
254+
_dead_count.store_relaxed(num_dead);
255255
_dead_state.release_store(DeadState::good);
256256
break;
257257

@@ -672,8 +672,8 @@ bool StringDedup::Table::cleanup_start_if_needed(bool grow_only, bool force) {
672672

673673
void StringDedup::Table::set_dead_state_cleaning() {
674674
MutexLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
675-
_dead_count.relaxed_store(0);
676-
_dead_state.relaxed_store(DeadState::cleaning);
675+
_dead_count.store_relaxed(0);
676+
_dead_state.store_relaxed(DeadState::cleaning);
677677
}
678678

679679
bool StringDedup::Table::start_resizer(bool grow_only, size_t number_of_entries) {
@@ -707,7 +707,7 @@ void StringDedup::Table::cleanup_end() {
707707
delete _cleanup_state;
708708
_cleanup_state = nullptr;
709709
MutexLocker ml(StringDedup_lock, Mutex::_no_safepoint_check_flag);
710-
_dead_state.relaxed_store(DeadState::wait2);
710+
_dead_state.store_relaxed(DeadState::wait2);
711711
}
712712

713713
void StringDedup::Table::verify() {

src/hotspot/share/runtime/atomic.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
// member functions:
7373
// v.load_relaxed() -> T
7474
// v.load_acquire() -> T
75-
// v.relaxed_store(x) -> void
75+
// v.store_relaxed(x) -> void
7676
// v.release_store(x) -> void
7777
// v.release_store_fence(x) -> void
7878
// v.cmpxchg(x, y [, o]) -> T
@@ -156,9 +156,9 @@
156156
// for testing for that are not provided. (There might have been some types on
157157
// some platforms that used a lock long-ago, but that's no longer the case.)
158158
//
159-
// * Rather than load/store operations with a memory order parameter,
160-
// Atomic<T> provides load_{relaxed,acquire}() and {relaxed,release}_store()
161-
// operations, as well as release_store_fence().
159+
// * Rather than load and store operations with a memory order parameter,
160+
// Atomic<T> provides load_relaxed(), load_acquire(), release_store(),
161+
// store_relaxed(), and release_store_fence() operations.
162162
//
163163
// * Atomic<T> doesn't provide operator overloads that perform various
164164
// operations with sequentially consistent ordering semantics. The rationale
@@ -266,7 +266,7 @@ class AtomicImpl::CommonCore {
266266
return AtomicAccess::load_acquire(value_ptr());
267267
}
268268

269-
void relaxed_store(T value) {
269+
void store_relaxed(T value) {
270270
AtomicAccess::store(value_ptr(), value);
271271
}
272272

@@ -546,8 +546,8 @@ class AtomicImpl::Atomic<T, AtomicImpl::Category::Translated>
546546
return recover(_value.load_acquire());
547547
}
548548

549-
void relaxed_store(T value) {
550-
_value.relaxed_store(decay(value));
549+
void store_relaxed(T value) {
550+
_value.store_relaxed(decay(value));
551551
}
552552

553553
void release_store(T value) {

src/hotspot/share/utilities/atomicNextAccess.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct AtomicNextAccess<T, next_access> {
7272
}
7373

7474
static void set_next(T& value, T* new_next) {
75-
next_access(value)->relaxed_store(new_next);
75+
next_access(value)->store_relaxed(new_next);
7676
}
7777

7878
static T* cmpxchg(T& value, const T* compare, T* exchange) {

src/hotspot/share/utilities/nonblockingQueue.inline.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void NonblockingQueue<T, next_access>::append(T& first, T& last) {
137137
}
138138
// The queue was empty, and first should become the new _head. The queue
139139
// will appear to be empty to any further try_pops until done.
140-
_head.relaxed_store(&first);
140+
_head.store_relaxed(&first);
141141
}
142142

143143
template<typename T, auto next_access>
@@ -243,8 +243,8 @@ Pair<T*, T*> NonblockingQueue<T, next_access>::take_all() {
243243
T* tail = _tail.load_relaxed();
244244
if (tail != nullptr) set_next(*tail, nullptr); // Clear end marker.
245245
Pair<T*, T*> result(_head.load_relaxed(), tail);
246-
_head.relaxed_store(nullptr);
247-
_tail.relaxed_store(nullptr);
246+
_head.store_relaxed(nullptr);
247+
_tail.store_relaxed(nullptr);
248248
return result;
249249
}
250250

src/hotspot/share/utilities/singleWriterSynchronizer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void SingleWriterSynchronizer::synchronize() {
6262
uint old;
6363
do {
6464
old = value;
65-
new_exit.relaxed_store(++value);
65+
new_exit.store_relaxed(++value);
6666
value = _enter.cmpxchg(old, value);
6767
} while (old != value);
6868
// Critical sections entered before we changed the polarity will use
@@ -74,7 +74,7 @@ void SingleWriterSynchronizer::synchronize() {
7474
// a pending synchronize waiting. The thread that completes the
7575
// request (_exit value == old) will signal the _wakeup semaphore to
7676
// allow us to proceed.
77-
_waiting_for.relaxed_store(old);
77+
_waiting_for.store_relaxed(old);
7878
// Write of _waiting_for must precede read of _exit and associated
7979
// conditional semaphore wait. If they were re-ordered then a
8080
// critical section exit could miss the wakeup request, failing to

0 commit comments

Comments
 (0)