--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Fri Feb 09 12:09:21 2018 +0530
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Fri Feb 09 13:09:55 2018 +0100
@@ -1010,7 +1010,7 @@
private:
G1HRPrinter* _hr_printer;
public:
- bool doHeapRegion(HeapRegion* hr) {
+ bool do_heap_region(HeapRegion* hr) {
assert(!hr->is_young(), "not expecting to find young regions");
_hr_printer->post_compaction(hr);
return false;
@@ -1917,7 +1917,7 @@
CheckGCTimeStampsHRClosure(unsigned gc_time_stamp) :
_gc_time_stamp(gc_time_stamp), _failures(false) { }
- virtual bool doHeapRegion(HeapRegion* hr) {
+ virtual bool do_heap_region(HeapRegion* hr) {
unsigned region_gc_time_stamp = hr->get_gc_time_stamp();
if (_gc_time_stamp != region_gc_time_stamp) {
log_error(gc, verify)("Region " HR_FORMAT " has GC time stamp = %d, expected %d", HR_FORMAT_PARAMS(hr),
@@ -1969,7 +1969,7 @@
size_t _used;
public:
SumUsedClosure() : _used(0) {}
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
_used += r->used();
return false;
}
@@ -2188,7 +2188,7 @@
ObjectClosure* _cl;
public:
IterateObjectClosureRegionClosure(ObjectClosure* cl) : _cl(cl) {}
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
if (!r->is_continues_humongous()) {
r->object_iterate(_cl);
}
@@ -2303,7 +2303,7 @@
outputStream* _st;
public:
PrintRegionClosure(outputStream* st) : _st(st) {}
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
r->print_on(_st);
return false;
}
@@ -2422,7 +2422,7 @@
size_t _occupied_sum;
public:
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
HeapRegionRemSet* hrrs = r->rem_set();
size_t occupied = hrrs->occupied();
_occupied_sum += occupied;
@@ -2669,7 +2669,7 @@
_dcq(&JavaThread::dirty_card_queue_set()) {
}
- virtual bool doHeapRegion(HeapRegion* r) {
+ virtual bool do_heap_region(HeapRegion* r) {
if (!r->is_starts_humongous()) {
return false;
}
@@ -2745,7 +2745,7 @@
class VerifyRegionRemSetClosure : public HeapRegionClosure {
public:
- bool doHeapRegion(HeapRegion* hr) {
+ bool do_heap_region(HeapRegion* hr) {
if (!hr->is_archive() && !hr->is_continues_humongous()) {
hr->verify_rem_set();
}
@@ -2815,7 +2815,7 @@
public:
G1PrintCollectionSetClosure(G1HRPrinter* hr_printer) : HeapRegionClosure(), _hr_printer(hr_printer) { }
- virtual bool doHeapRegion(HeapRegion* r) {
+ virtual bool do_heap_region(HeapRegion* r) {
_hr_printer->cset(r);
return false;
}
@@ -4505,7 +4505,7 @@
_local_free_list("Local Region List for CSet Freeing") {
}
- virtual bool doHeapRegion(HeapRegion* r) {
+ virtual bool do_heap_region(HeapRegion* r) {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
assert(r->in_collection_set(), "Region %u should be in collection set.", r->hrm_index());
@@ -4628,7 +4628,7 @@
public:
G1PrepareFreeCollectionSetClosure(WorkItem* work_items) : HeapRegionClosure(), _cur_idx(0), _work_items(work_items) { }
- virtual bool doHeapRegion(HeapRegion* r) {
+ virtual bool do_heap_region(HeapRegion* r) {
_work_items[_cur_idx++] = WorkItem(r);
return false;
}
@@ -4762,7 +4762,7 @@
_free_region_list(free_region_list), _humongous_objects_reclaimed(0), _humongous_regions_reclaimed(0), _freed_bytes(0) {
}
- virtual bool doHeapRegion(HeapRegion* r) {
+ virtual bool do_heap_region(HeapRegion* r) {
if (!r->is_starts_humongous()) {
return false;
}
@@ -4897,7 +4897,7 @@
class G1AbandonCollectionSetClosure : public HeapRegionClosure {
public:
- virtual bool doHeapRegion(HeapRegion* r) {
+ virtual bool do_heap_region(HeapRegion* r) {
assert(r->in_collection_set(), "Region %u must have been in collection set", r->hrm_index());
G1CollectedHeap::heap()->clear_in_cset(r);
r->set_young_index_in_cset(-1);
@@ -4967,7 +4967,7 @@
bool _success;
public:
NoYoungRegionsClosure() : _success(true) { }
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
if (r->is_young()) {
log_error(gc, verify)("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
p2i(r->bottom()), p2i(r->end()));
@@ -4997,7 +4997,7 @@
public:
TearDownRegionSetsClosure(HeapRegionSet* old_set) : _old_set(old_set) { }
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
if (r->is_old()) {
_old_set->remove(r);
} else if(r->is_young()) {
@@ -5065,7 +5065,7 @@
}
}
- bool doHeapRegion(HeapRegion* r) {
+ bool do_heap_region(HeapRegion* r) {
if (r->is_empty()) {
// Add free regions to the free list
r->set_free();