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

*** 88,98 ****
    void add_reference_work(OopOrNarrowOopStar from, bool par) {
      // Must make this robust in case "from" is not in "_hr", because of
      // concurrency.
  
      if (G1TraceHeapRegionRememberedSet) {
!       gclog_or_tty->print_cr("    PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").",
                               p2i(from),
                               UseCompressedOops
                               ? p2i(oopDesc::load_decode_heap_oop((narrowOop*)from))
                               : p2i(oopDesc::load_decode_heap_oop((oop*)from)));
      }
--- 88,98 ----
    void add_reference_work(OopOrNarrowOopStar from, bool par) {
      // Must make this robust in case "from" is not in "_hr", because of
      // concurrency.
  
      if (G1TraceHeapRegionRememberedSet) {
!       gclog_or_tty->print_cr("    PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
                               p2i(from),
                               UseCompressedOops
                               ? p2i(oopDesc::load_decode_heap_oop((narrowOop*)from))
                               : p2i(oopDesc::load_decode_heap_oop((oop*)from)));
      }
*** 374,384 ****
    invalidate(0, _max_regions);
  }
  
  void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
    guarantee((size_t)start_idx + new_num_regions <= max_uintx,
!             err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT,
                      start_idx, new_num_regions));
    for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
      uint end_idx = (start_idx + (uint)new_num_regions);
      assert(end_idx <= _max_regions, "Must be within max.");
      for (uint j = start_idx; j < end_idx; j++) {
--- 374,384 ----
    invalidate(0, _max_regions);
  }
  
  void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
    guarantee((size_t)start_idx + new_num_regions <= max_uintx,
!             err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT,
                      start_idx, new_num_regions));
    for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
      uint end_idx = (start_idx + (uint)new_num_regions);
      assert(end_idx <= _max_regions, "Must be within max.");
      for (uint j = start_idx; j < end_idx; j++) {
*** 628,644 ****
      gclog_or_tty->print_cr("Scrubbing region %u:", _hr->hrm_index());
    }
  
    assert(_coarse_map.size() == region_bm->size(), "Precondition");
    if (G1RSScrubVerbose) {
!     gclog_or_tty->print("   Coarse map: before = "SIZE_FORMAT"...",
                          _n_coarse_entries);
    }
    _coarse_map.set_intersection(*region_bm);
    _n_coarse_entries = _coarse_map.count_one_bits();
    if (G1RSScrubVerbose) {
!     gclog_or_tty->print_cr("   after = "SIZE_FORMAT".", _n_coarse_entries);
    }
  
    // Now do the fine-grained maps.
    for (size_t i = 0; i < _max_fine_entries; i++) {
      PerRegionTable* cur = _fine_grain_regions[i];
--- 628,644 ----
      gclog_or_tty->print_cr("Scrubbing region %u:", _hr->hrm_index());
    }
  
    assert(_coarse_map.size() == region_bm->size(), "Precondition");
    if (G1RSScrubVerbose) {
!     gclog_or_tty->print("   Coarse map: before = " SIZE_FORMAT "...",
                          _n_coarse_entries);
    }
    _coarse_map.set_intersection(*region_bm);
    _n_coarse_entries = _coarse_map.count_one_bits();
    if (G1RSScrubVerbose) {
!     gclog_or_tty->print_cr("   after = " SIZE_FORMAT ".", _n_coarse_entries);
    }
  
    // Now do the fine-grained maps.
    for (size_t i = 0; i < _max_fine_entries; i++) {
      PerRegionTable* cur = _fine_grain_regions[i];
*** 1011,1021 ****
      _cur_card_in_prt = _fine_cur_prt->_bm.get_next_one_offset(_cur_card_in_prt + 1);
    }
  
    card_index = _cur_region_card_offset + _cur_card_in_prt;
    guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
!             err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt));
    return true;
  }
  
  bool HeapRegionRemSetIterator::fine_has_next() {
    return _cur_card_in_prt != HeapRegion::CardsPerRegion;
--- 1011,1021 ----
      _cur_card_in_prt = _fine_cur_prt->_bm.get_next_one_offset(_cur_card_in_prt + 1);
    }
  
    card_index = _cur_region_card_offset + _cur_card_in_prt;
    guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
!             err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt));
    return true;
  }
  
  bool HeapRegionRemSetIterator::fine_has_next() {
    return _cur_card_in_prt != HeapRegion::CardsPerRegion;
*** 1180,1191 ****
  void PerRegionTable::test_fl_mem_size() {
    PerRegionTable* dummy = alloc(NULL);
  
    size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
    assert(dummy->mem_size() > min_prt_size,
!          err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. "
!                  "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size));
    free(dummy);
    guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
    // try to reset the state
    _free_list = NULL;
    delete dummy;
--- 1180,1191 ----
  void PerRegionTable::test_fl_mem_size() {
    PerRegionTable* dummy = alloc(NULL);
  
    size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
    assert(dummy->mem_size() > min_prt_size,
!          err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. "
!                  "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size));
    free(dummy);
    guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
    // try to reset the state
    _free_list = NULL;
    delete dummy;