src/share/vm/gc/g1/heapRegionSet.cpp

*** 28,38 ****
  #include "gc/g1/heapRegionSet.inline.hpp"
  
  uint FreeRegionList::_unrealistically_long_length = 0;
  
  void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
!   msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT,
                name(), message, length(), total_capacity_bytes());
    fill_in_ext_msg_extra(msg);
  }
  
  #ifndef PRODUCT
--- 28,38 ----
  #include "gc/g1/heapRegionSet.inline.hpp"
  
  uint FreeRegionList::_unrealistically_long_length = 0;
  
  void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
!   msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT,
                name(), message, length(), total_capacity_bytes());
    fill_in_ext_msg_extra(msg);
  }
  
  #ifndef PRODUCT
*** 80,96 ****
    _verify_in_progress = false;
  }
  
  void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
    out->cr();
!   out->print_cr("Set: %s ("PTR_FORMAT")", name(), p2i(this));
    out->print_cr("  Region Assumptions");
    out->print_cr("    humongous         : %s", BOOL_TO_STR(regions_humongous()));
    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),
--- 80,96 ----
    _verify_in_progress = false;
  }
  
  void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
    out->cr();
!   out->print_cr("Set: %s (" PTR_FORMAT ")", name(), p2i(this));
    out->print_cr("  Region Assumptions");
    out->print_cr("    humongous         : %s", BOOL_TO_STR(regions_humongous()));
    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),
*** 102,112 ****
    guarantee(_unrealistically_long_length == 0, "should only be set once");
    _unrealistically_long_length = len;
  }
  
  void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
!   msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, p2i(_head), p2i(_tail));
  }
  
  void FreeRegionList::remove_all() {
    check_mt_safety();
    verify_optional();
--- 102,112 ----
    guarantee(_unrealistically_long_length == 0, "should only be set once");
    _unrealistically_long_length = len;
  }
  
  void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
!   msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, p2i(_head), p2i(_tail));
  }
  
  void FreeRegionList::remove_all() {
    check_mt_safety();
    verify_optional();
*** 273,284 ****
  }
  
  void FreeRegionList::print_on(outputStream* out, bool print_contents) {
    HeapRegionSetBase::print_on(out, print_contents);
    out->print_cr("  Linking");
!   out->print_cr("    head              : "PTR_FORMAT, p2i(_head));
!   out->print_cr("    tail              : "PTR_FORMAT, p2i(_tail));
  
    if (print_contents) {
      out->print_cr("  Contents");
      FreeRegionListIterator iter(this);
      while (iter.more_available()) {
--- 273,284 ----
  }
  
  void FreeRegionList::print_on(outputStream* out, bool print_contents) {
    HeapRegionSetBase::print_on(out, print_contents);
    out->print_cr("  Linking");
!   out->print_cr("    head              : " PTR_FORMAT, p2i(_head));
!   out->print_cr("    tail              : " PTR_FORMAT, p2i(_tail));
  
    if (print_contents) {
      out->print_cr("  Contents");
      FreeRegionListIterator iter(this);
      while (iter.more_available()) {
*** 302,312 ****
    while (curr != NULL) {
      verify_region(curr);
  
      count++;
      guarantee(count < _unrealistically_long_length,
!         hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u",
              name(), count, p2i(curr), p2i(prev0), p2i(prev1), length()));
  
      if (curr->next() != NULL) {
        guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
      }
--- 302,312 ----
    while (curr != NULL) {
      verify_region(curr);
  
      count++;
      guarantee(count < _unrealistically_long_length,
!         hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: " PTR_FORMAT " prev0: " PTR_FORMAT " " "prev1: " PTR_FORMAT " length: %u",
              name(), count, p2i(curr), p2i(prev0), p2i(prev1), length()));
  
      if (curr->next() != NULL) {
        guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
      }