src/hotspot/share/gc/z/zStat.cpp

*** 1126,1182 ****
  }
  
  //
  // Stat relocation
  //
! ZStatRelocation::Group ZStatRelocation::_small;
! ZStatRelocation::Group ZStatRelocation::_medium;
! ZStatRelocation::Group ZStatRelocation::_large;
! bool                   ZStatRelocation::_success;
! 
! void ZStatRelocation::set_at_select_relocation_set(const ZRelocationSetSelectorGroupStats& small,
!                                                    const ZRelocationSetSelectorGroupStats& medium,
!                                                    const ZRelocationSetSelectorGroupStats& large) {
!   _small._npages = small.npages();
!   _small._total = small.total();
!   _small._empty = small.empty();
!   _small._compacting_from = small.compacting_from();
!   _small._compacting_to = small.compacting_to();
! 
!   _medium._npages = medium.npages();
!   _medium._total = medium.total();
!   _medium._empty = medium.empty();
!   _medium._compacting_from = medium.compacting_from();
!   _medium._compacting_to = medium.compacting_to();
! 
!   _large._npages = large.npages();
!   _large._total = large.total();
!   _large._empty = large.empty();
!   _large._compacting_from = large.compacting_from();
!   _large._compacting_to = large.compacting_to();
  }
  
  void ZStatRelocation::set_at_relocate_end(bool success) {
    _success = success;
  }
  
! void ZStatRelocation::print(const char* name, const ZStatRelocation::Group& group) {
!   const size_t total = _small._total + _medium._total + _large._total;
  
    log_info(gc, reloc)("%s Pages: " SIZE_FORMAT " / " ZSIZE_FMT ", Empty: " ZSIZE_FMT ", Compacting: " ZSIZE_FMT "->" ZSIZE_FMT,
                        name,
!                       group._npages,
!                       ZSIZE_ARGS_WITH_MAX(group._total, total),
!                       ZSIZE_ARGS_WITH_MAX(group._empty, total),
!                       ZSIZE_ARGS_WITH_MAX(group._compacting_from, total),
!                       ZSIZE_ARGS_WITH_MAX(group._compacting_to, total));
  }
  
  void ZStatRelocation::print() {
!   print("Small", _small);
!   print("Medium", _medium);
!   print("Large", _large);
  
    log_info(gc, reloc)("Relocation: %s", _success ? "Successful" : "Incomplete");
  }
  
  //
--- 1126,1162 ----
  }
  
  //
  // Stat relocation
  //
! ZRelocationSetSelectorStats ZStatRelocation::_stats;
! bool                        ZStatRelocation::_success;
! 
! void ZStatRelocation::set_at_select_relocation_set(const ZRelocationSetSelectorStats& stats) {
!   _stats = stats;
  }
  
  void ZStatRelocation::set_at_relocate_end(bool success) {
    _success = success;
  }
  
! void ZStatRelocation::print(const char* name, const ZRelocationSetSelectorGroupStats& group) {
!   const size_t total = _stats.small().total() + _stats.medium().total() + _stats.large().total();
  
    log_info(gc, reloc)("%s Pages: " SIZE_FORMAT " / " ZSIZE_FMT ", Empty: " ZSIZE_FMT ", Compacting: " ZSIZE_FMT "->" ZSIZE_FMT,
                        name,
!                       group.npages(),
!                       ZSIZE_ARGS_WITH_MAX(group.total(), total),
!                       ZSIZE_ARGS_WITH_MAX(group.empty(), total),
!                       ZSIZE_ARGS_WITH_MAX(group.compacting_from(), total),
!                       ZSIZE_ARGS_WITH_MAX(group.compacting_to(), total));
  }
  
  void ZStatRelocation::print() {
!   print("Small", _stats.small());
!   print("Medium", _stats.medium());
!   print("Large", _stats.large());
  
    log_info(gc, reloc)("Relocation: %s", _success ? "Successful" : "Incomplete");
  }
  
  //
*** 1310,1325 ****
    _at_mark_end.allocated = allocated;
    _at_mark_end.used = used;
    _at_mark_end.free = free(used);
  }
  
! void ZStatHeap::set_at_select_relocation_set(const ZRelocationSetSelectorGroupStats& small,
!                                              const ZRelocationSetSelectorGroupStats& medium,
!                                              const ZRelocationSetSelectorGroupStats& large,
!                                              size_t reclaimed) {
!   const size_t live = small.live() + medium.live() + large.live();
!   const size_t garbage = small.garbage() + medium.garbage() + large.garbage();
  
    _at_mark_end.live = live;
    _at_mark_end.garbage = garbage;
  
    _at_relocate_start.garbage = garbage - reclaimed;
--- 1290,1302 ----
    _at_mark_end.allocated = allocated;
    _at_mark_end.used = used;
    _at_mark_end.free = free(used);
  }
  
! void ZStatHeap::set_at_select_relocation_set(const ZRelocationSetSelectorStats& stats, size_t reclaimed) {
!   const size_t live = stats.small().live() + stats.medium().live() + stats.large().live();
!   const size_t garbage = stats.small().garbage() + stats.medium().garbage() + stats.large().garbage();
  
    _at_mark_end.live = live;
    _at_mark_end.garbage = garbage;
  
    _at_relocate_start.garbage = garbage - reclaimed;