archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8142390: Move ScanRSClosure to header file

Browse source 
Reviewed-by: jmasa, tschatzl
This commit is contained in:
Erik Helin 2015-10-19 16:21:35 +02:00
parent 57776e7af1
commit aefeb2d442
2 changed files with 119 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

49
hotspot/src/share/vm/gc/g1/g1RemSet.cpp
View file

@ -73,23 +73,7 @@ G1RemSet::~G1RemSet() {
FREE_C_HEAP_ARRAY(G1ParPushHeapRSClosure*, _cset_rs_update_cl); FREE_C_HEAP_ARRAY(G1ParPushHeapRSClosure*, _cset_rs_update_cl);
} }
class ScanRSClosure : public HeapRegionClosure { ScanRSClosure::ScanRSClosure(G1ParPushHeapRSClosure* oc,
size_t _cards_done, _cards;
G1CollectedHeap* _g1h;
G1ParPushHeapRSClosure* _oc;
CodeBlobClosure* _code_root_cl;
G1BlockOffsetSharedArray* _bot_shared;
G1SATBCardTableModRefBS *_ct_bs;
double _strong_code_root_scan_time_sec;
uint _worker_i;
size_t _block_size;
bool _try_claimed;
public:
ScanRSClosure(G1ParPushHeapRSClosure* oc,
CodeBlobClosure* code_root_cl, CodeBlobClosure* code_root_cl,
uint worker_i) : uint worker_i) :
_oc(oc), _oc(oc),
@ -98,17 +82,14 @@ public:
_cards(0), _cards(0),
_cards_done(0), _cards_done(0),
_worker_i(worker_i), _worker_i(worker_i),
_try_claimed(false) _try_claimed(false) {
{
_g1h = G1CollectedHeap::heap(); _g1h = G1CollectedHeap::heap();
_bot_shared = _g1h->bot_shared(); _bot_shared = _g1h->bot_shared();
_ct_bs = _g1h->g1_barrier_set(); _ct_bs = _g1h->g1_barrier_set();
_block_size = MAX2<size_t>(G1RSetScanBlockSize, 1); _block_size = MAX2<size_t>(G1RSetScanBlockSize, 1);
} }
void set_try_claimed() { _try_claimed = true; } void ScanRSClosure::scanCard(size_t index, HeapRegion *r) {
void scanCard(size_t index, HeapRegion *r) {
// Stack allocate the DirtyCardToOopClosure instance // Stack allocate the DirtyCardToOopClosure instance
HeapRegionDCTOC cl(_g1h, r, _oc, HeapRegionDCTOC cl(_g1h, r, _oc,
CardTableModRefBS::Precise); CardTableModRefBS::Precise);
@ -126,9 +107,9 @@ public:
_cards_done++; _cards_done++;
cl.do_MemRegion(mr); cl.do_MemRegion(mr);
} }
} }
void printCard(HeapRegion* card_region, size_t card_index, void ScanRSClosure::printCard(HeapRegion* card_region, size_t card_index,
HeapWord* card_start) { HeapWord* card_start) {
gclog_or_tty->print_cr("T %u Region [" PTR_FORMAT ", " PTR_FORMAT ") " gclog_or_tty->print_cr("T %u Region [" PTR_FORMAT ", " PTR_FORMAT ") "
"RS names card " SIZE_FORMAT_HEX ": " "RS names card " SIZE_FORMAT_HEX ": "
@ -137,15 +118,15 @@ public:
p2i(card_region->bottom()), p2i(card_region->end()), p2i(card_region->bottom()), p2i(card_region->end()),
card_index, card_index,
p2i(card_start), p2i(card_start + G1BlockOffsetSharedArray::N_words)); p2i(card_start), p2i(card_start + G1BlockOffsetSharedArray::N_words));
} }
void scan_strong_code_roots(HeapRegion* r) { void ScanRSClosure::scan_strong_code_roots(HeapRegion* r) {
double scan_start = os::elapsedTime(); double scan_start = os::elapsedTime();
r->strong_code_roots_do(_code_root_cl); r->strong_code_roots_do(_code_root_cl);
_strong_code_root_scan_time_sec += (os::elapsedTime() - scan_start); _strong_code_root_scan_time_sec += (os::elapsedTime() - scan_start);
} }
bool doHeapRegion(HeapRegion* r) { bool ScanRSClosure::doHeapRegion(HeapRegion* r) {
assert(r->in_collection_set(), "should only be called on elements of CS."); assert(r->in_collection_set(), "should only be called on elements of CS.");
HeapRegionRemSet* hrrs = r->rem_set(); HeapRegionRemSet* hrrs = r->rem_set();
if (hrrs->iter_is_complete()) return false; // All done. if (hrrs->iter_is_complete()) return false; // All done.
@ -196,15 +177,7 @@ public:
hrrs->set_iter_complete(); hrrs->set_iter_complete();
} }
return false; return false;
} }
double strong_code_root_scan_time_sec() {
return _strong_code_root_scan_time_sec;
}
size_t cards_done() { return _cards_done;}
size_t cards_looked_up() { return _cards;}
};
size_t G1RemSet::scanRS(G1ParPushHeapRSClosure* oc, size_t G1RemSet::scanRS(G1ParPushHeapRSClosure* oc,
CodeBlobClosure* heap_region_codeblobs, CodeBlobClosure* heap_region_codeblobs,

35
hotspot/src/share/vm/gc/g1/g1RemSet.hpp
View file

@ -156,6 +156,41 @@ public:
} }
}; };
class ScanRSClosure : public HeapRegionClosure {
size_t _cards_done, _cards;
G1CollectedHeap* _g1h;
G1ParPushHeapRSClosure* _oc;
CodeBlobClosure* _code_root_cl;
G1BlockOffsetSharedArray* _bot_shared;
G1SATBCardTableModRefBS *_ct_bs;
double _strong_code_root_scan_time_sec;
uint _worker_i;
size_t _block_size;
bool _try_claimed;
public:
ScanRSClosure(G1ParPushHeapRSClosure* oc,
CodeBlobClosure* code_root_cl,
uint worker_i);
bool doHeapRegion(HeapRegion* r);
double strong_code_root_scan_time_sec() {
return _strong_code_root_scan_time_sec;
}
size_t cards_done() { return _cards_done;}
size_t cards_looked_up() { return _cards;}
void set_try_claimed() { _try_claimed = true; }
private:
void scanCard(size_t index, HeapRegion *r);
void printCard(HeapRegion* card_region, size_t card_index,
HeapWord* card_start);
void scan_strong_code_roots(HeapRegion* r);
};
class UpdateRSOopClosure: public ExtendedOopClosure { class UpdateRSOopClosure: public ExtendedOopClosure {
HeapRegion* _from; HeapRegion* _from;
G1RemSet* _rs; G1RemSet* _rs;