< prev index next >
src/share/vm/gc/g1/g1RemSet.cpp
Print this page
@@ -95,11 +95,11 @@
_cards(0),
_cards_done(0),
_worker_i(worker_i),
_try_claimed(false) {
_g1h = G1CollectedHeap::heap();
- _bot_shared = _g1h->bot_shared();
+ _bot = _g1h->bot();
_ct_bs = _g1h->g1_barrier_set();
_block_size = MAX2<size_t>(G1RSetScanBlockSize, 1);
}
void ScanRSClosure::scanCard(size_t index, HeapRegion *r) {
@@ -107,11 +107,11 @@
HeapRegionDCTOC cl(_g1h, r, _oc,
CardTableModRefBS::Precise);
// Set the "from" region in the closure.
_oc->set_region(r);
- MemRegion card_region(_bot_shared->address_for_index(index), G1BlockOffsetSharedArray::N_words);
+ MemRegion card_region(_bot->address_for_index(index), G1BlockOffsetTable::N_words);
MemRegion pre_gc_allocated(r->bottom(), r->scan_top());
MemRegion mr = pre_gc_allocated.intersection(card_region);
if (!mr.is_empty() && !_ct_bs->is_card_claimed(index)) {
// We make the card as "claimed" lazily (so races are possible
// but they're benign), which reduces the number of duplicate
@@ -151,11 +151,11 @@
for (size_t current_card = 0; iter.has_next(card_index); current_card++) {
if (current_card >= jump_to_card + _block_size) {
jump_to_card = hrrs->iter_claimed_next(_block_size);
}
if (current_card < jump_to_card) continue;
- HeapWord* card_start = _g1h->bot_shared()->address_for_index(card_index);
+ HeapWord* card_start = _g1h->bot()->address_for_index(card_index);
HeapRegion* card_region = _g1h->heap_region_containing(card_start);
_cards++;
if (!card_region->is_on_dirty_cards_region_list()) {
< prev index next >