1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.cpp Wed Aug 27 09:36:55 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.cpp Tue Aug 26 09:36:53 2014 +0200
1.3 @@ -39,11 +39,11 @@
1.4
1.5 #ifndef PRODUCT
1.6 void HeapRegionSetBase::verify_region(HeapRegion* hr) {
1.7 - assert(hr->containing_set() == this, err_msg("Inconsistent containing set for %u", hr->hrs_index()));
1.8 - assert(!hr->is_young(), err_msg("Adding young region %u", hr->hrs_index())); // currently we don't use these sets for young regions
1.9 - assert(hr->isHumongous() == regions_humongous(), err_msg("Wrong humongous state for region %u and set %s", hr->hrs_index(), name()));
1.10 - assert(hr->is_empty() == regions_empty(), err_msg("Wrong empty state for region %u and set %s", hr->hrs_index(), name()));
1.11 - assert(hr->rem_set()->verify_ready_for_par_iteration(), err_msg("Wrong iteration state %u", hr->hrs_index()));
1.12 + assert(hr->containing_set() == this, err_msg("Inconsistent containing set for %u", hr->hrm_index()));
1.13 + assert(!hr->is_young(), err_msg("Adding young region %u", hr->hrm_index())); // currently we don't use these sets for young regions
1.14 + assert(hr->isHumongous() == regions_humongous(), err_msg("Wrong humongous state for region %u and set %s", hr->hrm_index(), name()));
1.15 + assert(hr->is_empty() == regions_empty(), err_msg("Wrong empty state for region %u and set %s", hr->hrm_index(), name()));
1.16 + assert(hr->rem_set()->verify_ready_for_par_iteration(), err_msg("Wrong iteration state %u", hr->hrm_index()));
1.17 }
1.18 #endif
1.19
1.20 @@ -158,7 +158,7 @@
1.21 HeapRegion* curr_from = from_list->_head;
1.22
1.23 while (curr_from != NULL) {
1.24 - while (curr_to != NULL && curr_to->hrs_index() < curr_from->hrs_index()) {
1.25 + while (curr_to != NULL && curr_to->hrm_index() < curr_from->hrm_index()) {
1.26 curr_to = curr_to->next();
1.27 }
1.28
1.29 @@ -183,7 +183,7 @@
1.30 }
1.31 }
1.32
1.33 - if (_tail->hrs_index() < from_list->_tail->hrs_index()) {
1.34 + if (_tail->hrm_index() < from_list->_tail->hrm_index()) {
1.35 _tail = from_list->_tail;
1.36 }
1.37 }
1.38 @@ -309,8 +309,8 @@
1.39 if (curr->next() != NULL) {
1.40 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
1.41 }
1.42 - guarantee(curr->hrs_index() == 0 || curr->hrs_index() > last_index, "List should be sorted");
1.43 - last_index = curr->hrs_index();
1.44 + guarantee(curr->hrm_index() == 0 || curr->hrm_index() > last_index, "List should be sorted");
1.45 + last_index = curr->hrm_index();
1.46
1.47 capacity += curr->capacity();
1.48
1.49 @@ -319,7 +319,7 @@
1.50 curr = curr->next();
1.51 }
1.52
1.53 - guarantee(_tail == prev0, err_msg("Expected %s to end with %u but it ended with %u.", name(), _tail->hrs_index(), prev0->hrs_index()));
1.54 + guarantee(_tail == prev0, err_msg("Expected %s to end with %u but it ended with %u.", name(), _tail->hrm_index(), prev0->hrm_index()));
1.55 guarantee(_tail == NULL || _tail->next() == NULL, "_tail should not have a next");
1.56 guarantee(length() == count, err_msg("%s count mismatch. Expected %u, actual %u.", name(), length(), count));
1.57 guarantee(total_capacity_bytes() == capacity, err_msg("%s capacity mismatch. Expected " SIZE_FORMAT ", actual " SIZE_FORMAT,
