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

rev 53923 : [mq]: 8219747-remove-g1-prefix

*** 287,297 ****
    _scan_state(new G1RemSetScanState()),
    _prev_period_summary(),
    _g1h(g1h),
    _num_conc_refined_cards(0),
    _ct(ct),
!   _g1p(_g1h->g1_policy()),
    _hot_card_cache(hot_card_cache) {
  }
  
  G1RemSet::~G1RemSet() {
    if (_scan_state != NULL) {
--- 287,297 ----
    _scan_state(new G1RemSetScanState()),
    _prev_period_summary(),
    _g1h(g1h),
    _num_conc_refined_cards(0),
    _ct(ct),
!   _g1p(_g1h->policy()),
    _hot_card_cache(hot_card_cache) {
  }
  
  G1RemSet::~G1RemSet() {
    if (_scan_state != NULL) {
*** 466,476 ****
  
    size_t _cards_scanned;
    size_t _cards_skipped;
  public:
    G1RefineCardClosure(G1CollectedHeap* g1h, G1ScanObjsDuringUpdateRSClosure* update_rs_cl) :
!     _g1rs(g1h->g1_rem_set()), _update_rs_cl(update_rs_cl), _cards_scanned(0), _cards_skipped(0)
    {}
  
    bool do_card_ptr(jbyte* card_ptr, uint worker_i) {
      // The only time we care about recording cards that
      // contain references that point into the collection set
--- 466,476 ----
  
    size_t _cards_scanned;
    size_t _cards_skipped;
  public:
    G1RefineCardClosure(G1CollectedHeap* g1h, G1ScanObjsDuringUpdateRSClosure* update_rs_cl) :
!     _g1rs(g1h->rem_set()), _update_rs_cl(update_rs_cl), _cards_scanned(0), _cards_skipped(0)
    {}
  
    bool do_card_ptr(jbyte* card_ptr, uint worker_i) {
      // The only time we care about recording cards that
      // contain references that point into the collection set
*** 529,539 ****
  
    _scan_state->reset();
  }
  
  void G1RemSet::cleanup_after_oops_into_collection_set_do() {
!   G1GCPhaseTimes* phase_times = _g1h->g1_policy()->phase_times();
  
    // Set all cards back to clean.
    double start = os::elapsedTime();
    _scan_state->clear_card_table(_g1h->workers());
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);
--- 529,539 ----
  
    _scan_state->reset();
  }
  
  void G1RemSet::cleanup_after_oops_into_collection_set_do() {
!   G1GCPhaseTimes* phase_times = _g1h->policy()->phase_times();
  
    // Set all cards back to clean.
    double start = os::elapsedTime();
    _scan_state->clear_card_table(_g1h->workers());
    phase_times->record_clear_ct_time((os::elapsedTime() - start) * 1000.0);