infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-18 14:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

8213997: Remove G1HRRSUseSparseTable flag

Browse Source 
Remove develop flag because it is not used anyway.

Reviewed-by: shade, manc
This commit is contained in:
Thomas Schatzl 2018-11-22 09:25:19 +01:00
parent 34a1c2e6bb
commit 0febdff79b
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/gc/g1/g1_globals.hpp
View File

@ -190,9 +190,6 @@
"to minimize the probability of promotion failure.") \
range(0, 50) \
\
develop(bool, G1HRRSUseSparseTable, true, \
"When true, use sparse table to save space.") \
\
product(size_t, G1HeapRegionSize, 0, \
"Size of the G1 regions.") \
range(0, 32*M) \

23
src/hotspot/share/gc/g1/heapRegionRemSet.cpp
View File

@ -368,8 +368,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
CardIdx_t card_index = card_within_region(from, from_hr);
if (G1HRRSUseSparseTable &&
_sparse_table.add_card(from_hrm_ind, card_index)) {
if (_sparse_table.add_card(from_hrm_ind, card_index)) {
assert(contains_reference_locked(from), "We just added " PTR_FORMAT " to the Sparse table", p2i(from));
return;
}
@ -397,18 +396,16 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
OrderAccess::release_store(&_fine_grain_regions[ind], prt);
_n_fine_entries++;
if (G1HRRSUseSparseTable) {
// Transfer from sparse to fine-grain.
SparsePRTEntry *sprt_entry = _sparse_table.get_entry(from_hrm_ind);
assert(sprt_entry != NULL, "There should have been an entry");
for (int i = 0; i < sprt_entry->num_valid_cards(); i++) {
CardIdx_t c = sprt_entry->card(i);
prt->add_card(c);
}
// Now we can delete the sparse entry.
bool res = _sparse_table.delete_entry(from_hrm_ind);
assert(res, "It should have been there.");
// Transfer from sparse to fine-grain.
SparsePRTEntry *sprt_entry = _sparse_table.get_entry(from_hrm_ind);
assert(sprt_entry != NULL, "There should have been an entry");
for (int i = 0; i < sprt_entry->num_valid_cards(); i++) {
CardIdx_t c = sprt_entry->card(i);
prt->add_card(c);
}
// Now we can delete the sparse entry.
bool res = _sparse_table.delete_entry(from_hrm_ind);
assert(res, "It should have been there.");
}
assert(prt != NULL && prt->hr() == from_hr, "consequence");
}