src/hotspot/share/gc/g1/g1SurvRateGroup.cpp

rev 57044 : imported patch 8227434-g1-predictions-overflow
rev 57051 : imported patch 8233588-cleanup-survrategroup
rev 57052 : imported patch 8233588-kbarrett-review
rev 57055 : imported patch 8234574-analytics-renaming
rev 57057 : imported patch 8234586-rename-survrategroup-files
rev 57058 : imported patch 8234587-rename-g1survrategroup

*** 28,48 ****
  #include "gc/g1/g1SurvRateGroup.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  
! SurvRateGroup::SurvRateGroup() :
    _stats_arrays_length(0),
    _accum_surv_rate_pred(NULL),
    _last_pred(0.0),
    _surv_rate_predictors(NULL),
    _num_added_regions(0) {
    reset();
    start_adding_regions();
  }
  
! void SurvRateGroup::reset() {
    _last_pred = 0.0;
    // the following will set up the arrays with length 1
    _num_added_regions = 1;
  
    // The call to stop_adding_regions() will use "new" to refill
--- 28,48 ----
  #include "gc/g1/g1SurvRateGroup.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "logging/log.hpp"
  #include "memory/allocation.hpp"
  
! G1SurvRateGroup::G1SurvRateGroup() :
    _stats_arrays_length(0),
    _accum_surv_rate_pred(NULL),
    _last_pred(0.0),
    _surv_rate_predictors(NULL),
    _num_added_regions(0) {
    reset();
    start_adding_regions();
  }
  
! void G1SurvRateGroup::reset() {
    _last_pred = 0.0;
    // the following will set up the arrays with length 1
    _num_added_regions = 1;
  
    // The call to stop_adding_regions() will use "new" to refill
*** 63,77 ****
    _last_pred = _accum_surv_rate_pred[0] = initial_surv_rate;
  
    _num_added_regions = 0;
  }
  
! void SurvRateGroup::start_adding_regions() {
    _num_added_regions = 0;
  }
  
! void SurvRateGroup::stop_adding_regions() {
    if (_num_added_regions > _stats_arrays_length) {
      _accum_surv_rate_pred = REALLOC_C_HEAP_ARRAY(double, _accum_surv_rate_pred, _num_added_regions, mtGC);
      _surv_rate_predictors = REALLOC_C_HEAP_ARRAY(TruncatedSeq*, _surv_rate_predictors, _num_added_regions, mtGC);
  
      for (size_t i = _stats_arrays_length; i < _num_added_regions; ++i) {
--- 63,77 ----
    _last_pred = _accum_surv_rate_pred[0] = initial_surv_rate;
  
    _num_added_regions = 0;
  }
  
! void G1SurvRateGroup::start_adding_regions() {
    _num_added_regions = 0;
  }
  
! void G1SurvRateGroup::stop_adding_regions() {
    if (_num_added_regions > _stats_arrays_length) {
      _accum_surv_rate_pred = REALLOC_C_HEAP_ARRAY(double, _accum_surv_rate_pred, _num_added_regions, mtGC);
      _surv_rate_predictors = REALLOC_C_HEAP_ARRAY(TruncatedSeq*, _surv_rate_predictors, _num_added_regions, mtGC);
  
      for (size_t i = _stats_arrays_length; i < _num_added_regions; ++i) {
*** 80,114 ****
  
      _stats_arrays_length = _num_added_regions;
    }
  }
  
! void SurvRateGroup::record_surviving_words(int age_in_group, size_t surv_words) {
    guarantee(0 <= age_in_group && (size_t)age_in_group < _num_added_regions,
              "age_in_group is %d not between 0 and " SIZE_FORMAT, age_in_group, _num_added_regions);
  
    double surv_rate = (double)surv_words / HeapRegion::GrainWords;
    _surv_rate_predictors[age_in_group]->add(surv_rate);
  }
  
! void SurvRateGroup::all_surviving_words_recorded(const G1Predictions& predictor, bool update_predictors) {
    if (update_predictors) {
      fill_in_last_surv_rates();
    }
    finalize_predictions(predictor);
  }
  
! void SurvRateGroup::fill_in_last_surv_rates() {
    if (_num_added_regions > 0) { // conservative
      double surv_rate = _surv_rate_predictors[_num_added_regions-1]->last();
      for (size_t i = _num_added_regions; i < _stats_arrays_length; ++i) {
        _surv_rate_predictors[i]->add(surv_rate);
      }
    }
  }
  
! void SurvRateGroup::finalize_predictions(const G1Predictions& predictor) {
    double accum = 0.0;
    double pred = 0.0;
    for (size_t i = 0; i < _stats_arrays_length; ++i) {
      pred = predictor.predict_in_unit_interval(_surv_rate_predictors[i]);
      accum += pred;
--- 80,114 ----
  
      _stats_arrays_length = _num_added_regions;
    }
  }
  
! void G1SurvRateGroup::record_surviving_words(int age_in_group, size_t surv_words) {
    guarantee(0 <= age_in_group && (size_t)age_in_group < _num_added_regions,
              "age_in_group is %d not between 0 and " SIZE_FORMAT, age_in_group, _num_added_regions);
  
    double surv_rate = (double)surv_words / HeapRegion::GrainWords;
    _surv_rate_predictors[age_in_group]->add(surv_rate);
  }
  
! void G1SurvRateGroup::all_surviving_words_recorded(const G1Predictions& predictor, bool update_predictors) {
    if (update_predictors) {
      fill_in_last_surv_rates();
    }
    finalize_predictions(predictor);
  }
  
! void G1SurvRateGroup::fill_in_last_surv_rates() {
    if (_num_added_regions > 0) { // conservative
      double surv_rate = _surv_rate_predictors[_num_added_regions-1]->last();
      for (size_t i = _num_added_regions; i < _stats_arrays_length; ++i) {
        _surv_rate_predictors[i]->add(surv_rate);
      }
    }
  }
  
! void G1SurvRateGroup::finalize_predictions(const G1Predictions& predictor) {
    double accum = 0.0;
    double pred = 0.0;
    for (size_t i = 0; i < _stats_arrays_length; ++i) {
      pred = predictor.predict_in_unit_interval(_surv_rate_predictors[i]);
      accum += pred;