Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8304657: G1: Rename set_state_empty to set_state_untracked #13118

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.cpp
Original file line number Diff line number Diff line change
@@ -47,10 +47,10 @@ void G1RemSetTrackingPolicy::update_at_allocate(HeapRegion* r) {
r->rem_set()->set_state_complete();
} else if (r->is_archive()) {
// Archive regions never move ever. So never build remembered sets for them.
r->rem_set()->set_state_empty();
r->rem_set()->set_state_untracked();
} else if (r->is_old()) {
// By default, do not create remembered set for new old regions.
r->rem_set()->set_state_empty();
r->rem_set()->set_state_untracked();
} else {
guarantee(false, "Unhandled region %u with heap region type %s", r->hrm_index(), r->get_type_str());
}
2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/heapRegionRemSet.cpp
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ void HeapRegionRemSet::clear_locked(bool only_cardset) {
}
clear_fcc();
_card_set.clear();
set_state_empty();
set_state_untracked();
assert(occupied() == 0, "Should be clear.");
}

2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/heapRegionRemSet.hpp
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ class HeapRegionRemSet : public CHeapObj<mtGC> {
bool is_updating() { return _state == Updating; }
bool is_complete() { return _state == Complete; }

inline void set_state_empty();
inline void set_state_untracked();
inline void set_state_updating();
inline void set_state_complete();

2 changes: 1 addition & 1 deletion src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
#include "runtime/atomic.hpp"
#include "utilities/bitMap.inline.hpp"

void HeapRegionRemSet::set_state_empty() {
void HeapRegionRemSet::set_state_untracked() {
guarantee(SafepointSynchronize::is_at_safepoint() || !is_tracked(),
"Should only set to Untracked during safepoint but is %s.", get_state_str());
if (_state == Untracked) {