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

8144996: Replace the HeapRegionSetCount class with an uint

Browse source 
Reviewed-by: brutisso, jwilhelm
This commit is contained in:
David Lindholm 2015-12-11 13:48:52 +01:00
parent faf57db7c8
commit a1a959760b
12 changed files with 65 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hotspot/src/share/vm/gc/g1/heapRegionSet.cpp
View file

@ -49,8 +49,8 @@ void HeapRegionSetBase::verify() {
// verification might fail and send us on a wild goose chase.
check_mt_safety();
guarantee_heap_region_set(( is_empty() && length() == 0 && total_capacity_bytes() == 0) ||
(!is_empty() && length() > 0 && total_capacity_bytes() > 0) ,
guarantee_heap_region_set(( is_empty() && length() == 0) ||
(!is_empty() && length() > 0),
"invariant");
}
@ -81,14 +81,12 @@ void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
out->print_cr(" free : %s", BOOL_TO_STR(regions_free()));
out->print_cr(" Attributes");
out->print_cr(" length : %14u", length());
out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes",
total_capacity_bytes());
}
HeapRegionSetBase::HeapRegionSetBase(const char* name, bool humongous, bool free, HRSMtSafeChecker* mt_safety_checker)
: _name(name), _verify_in_progress(false),
_is_humongous(humongous), _is_free(free), _mt_safety_checker(mt_safety_checker),
_count()
_length(0)
{ }
void FreeRegionList::set_unrealistically_long_length(uint len) {
@ -177,7 +175,7 @@ void FreeRegionList::add_ordered(FreeRegionList* from_list) {
}
}
_count.increment(from_list->length(), from_list->total_capacity_bytes());
_length += from_list->length();
from_list->clear();
verify_optional();
@ -255,7 +253,7 @@ void FreeRegionList::verify() {
}
void FreeRegionList::clear() {
_count = HeapRegionSetCount();
_length = 0;
_head = NULL;
_tail = NULL;
_last = NULL;
@ -294,8 +292,6 @@ void FreeRegionList::verify_list() {
guarantee(_tail == prev0, "Expected %s to end with %u but it ended with %u.", name(), _tail->hrm_index(), prev0->hrm_index());
guarantee(_tail == NULL || _tail->next() == NULL, "_tail should not have a next");
guarantee(length() == count, "%s count mismatch. Expected %u, actual %u.", name(), length(), count);
guarantee(total_capacity_bytes() == capacity, "%s capacity mismatch. Expected " SIZE_FORMAT ", actual " SIZE_FORMAT,
name(), total_capacity_bytes(), capacity);
}
// Note on the check_mt_safety() methods below: