src/share/vm/gc_implementation/g1/heapRegion.hpp
Print this page
rev 3463 : 7114678: G1: various small fixes, code cleanup, and refactoring
Summary: Various cleanups as a prelude to introducing iterators for HeapRegions.
Reviewed-by: johnc
Contributed-by: tonyp
@@ -53,11 +53,14 @@
class HeapRegionSetBase;
#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
#define HR_FORMAT_PARAMS(_hr_) \
(_hr_)->hrs_index(), \
- (_hr_)->is_survivor() ? "S" : (_hr_)->is_young() ? "E" : "-", \
+ (_hr_)->is_survivor() ? "S" : (_hr_)->is_young() ? "E" : \
+ (_hr_)->startsHumongous() ? "HS" : \
+ (_hr_)->continuesHumongous() ? "HC" : \
+ !(_hr_)->is_empty() ? "O" : "F", \
(_hr_)->bottom(), (_hr_)->top(), (_hr_)->end()
// sentinel value for hrs_index
#define G1_NULL_HRS_INDEX ((uint) -1)
@@ -171,10 +174,11 @@
void set_end(HeapWord* value);
virtual HeapWord* saved_mark_word() const;
virtual void set_saved_mark();
void reset_gc_time_stamp() { _gc_time_stamp = 0; }
+ unsigned get_gc_time_stamp() { return _gc_time_stamp; }
// See the comment above in the declaration of _pre_dummy_top for an
// explanation of what it is.
void set_pre_dummy_top(HeapWord* pre_dummy_top) {
assert(is_in(pre_dummy_top) && pre_dummy_top <= top(), "pre-condition");
@@ -437,10 +441,29 @@
// For a humongous region, region in which it starts.
HeapRegion* humongous_start_region() const {
return _humongous_start_region;
}
+ // Return the number of distinct regions that are covered by this region:
+ // 1 if the region is not humongous, >= 1 if the region is humongous.
+ uint region_num() const {
+ if (!isHumongous()) {
+ return 1U;
+ } else {
+ assert(startsHumongous(), "doesn't make sense on HC regions");
+ assert(capacity() % HeapRegion::GrainBytes == 0, "sanity");
+ return (uint) (capacity() >> HeapRegion::LogOfHRGrainBytes);
+ }
+ }
+
+ // Return the index + 1 of the last HC regions that's associated
+ // with this HS region.
+ uint last_hc_index() const {
+ assert(startsHumongous(), "don't call this otherwise");
+ return hrs_index() + region_num();
+ }
+
// Same as Space::is_in_reserved, but will use the original size of the region.
// The original size is different only for start humongous regions. They get
// their _end set up to be the end of the last continues region of the
// corresponding humongous object.
bool is_in_reserved_raw(const void* p) const {
@@ -620,12 +643,12 @@
// Returns "false" iff no object in the region was allocated when the
// last mark phase ended.
bool is_marked() { return _prev_top_at_mark_start != bottom(); }
void reset_during_compaction() {
- guarantee( isHumongous() && startsHumongous(),
- "should only be called for humongous regions");
+ assert(isHumongous() && startsHumongous(),
+ "should only be called for starts humongous regions");
zero_marked_bytes();
init_top_at_mark_start();
}
@@ -772,11 +795,11 @@
#define HeapRegion_OOP_SINCE_SAVE_MARKS_DECL(OopClosureType, nv_suffix) \
virtual void oop_since_save_marks_iterate##nv_suffix(OopClosureType* cl);
SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(HeapRegion_OOP_SINCE_SAVE_MARKS_DECL)
- CompactibleSpace* next_compaction_space() const;
+ virtual CompactibleSpace* next_compaction_space() const;
virtual void reset_after_compaction();
void print() const;
void print_on(outputStream* st) const;