1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.cpp Tue Sep 16 11:03:19 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.cpp Tue Sep 16 14:27:40 2014 +0200
1.3 @@ -42,7 +42,9 @@
1.4 assert(hr->containing_set() == this, err_msg("Inconsistent containing set for %u", hr->hrm_index()));
1.5 assert(!hr->is_young(), err_msg("Adding young region %u", hr->hrm_index())); // currently we don't use these sets for young regions
1.6 assert(hr->isHumongous() == regions_humongous(), err_msg("Wrong humongous state for region %u and set %s", hr->hrm_index(), name()));
1.7 - assert(hr->is_empty() == regions_empty(), err_msg("Wrong empty state for region %u and set %s", hr->hrm_index(), name()));
1.8 + assert(hr->is_free() == regions_free(), err_msg("Wrong free state for region %u and set %s", hr->hrm_index(), name()));
1.9 + assert(!hr->is_free() || hr->is_empty(), err_msg("Free region %u is not empty for set %s", hr->hrm_index(), name()));
1.10 + assert(!hr->is_empty() || hr->is_free(), err_msg("Empty region %u is not free for set %s", hr->hrm_index(), name()));
1.11 assert(hr->rem_set()->verify_ready_for_par_iteration(), err_msg("Wrong iteration state %u", hr->hrm_index()));
1.12 }
1.13 #endif
1.14 @@ -85,16 +87,16 @@
1.15 out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
1.16 out->print_cr(" Region Assumptions");
1.17 out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous()));
1.18 - out->print_cr(" empty : %s", BOOL_TO_STR(regions_empty()));
1.19 + out->print_cr(" free : %s", BOOL_TO_STR(regions_free()));
1.20 out->print_cr(" Attributes");
1.21 out->print_cr(" length : %14u", length());
1.22 out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes",
1.23 total_capacity_bytes());
1.24 }
1.25
1.26 -HeapRegionSetBase::HeapRegionSetBase(const char* name, bool humongous, bool empty, HRSMtSafeChecker* mt_safety_checker)
1.27 +HeapRegionSetBase::HeapRegionSetBase(const char* name, bool humongous, bool free, HRSMtSafeChecker* mt_safety_checker)
1.28 : _name(name), _verify_in_progress(false),
1.29 - _is_humongous(humongous), _is_empty(empty), _mt_safety_checker(mt_safety_checker),
1.30 + _is_humongous(humongous), _is_free(free), _mt_safety_checker(mt_safety_checker),
1.31 _count()
1.32 { }
1.33
