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

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

*** 1011,1021 ****
      G1PrintRegionLivenessInfoClosure* _cl;
  
      uint _num_regions_selected_for_rebuild;  // The number of regions actually selected for rebuild.
  
      void update_remset_before_rebuild(HeapRegion* hr) {
!       G1RemSetTrackingPolicy* tracking_policy = _g1h->g1_policy()->remset_tracker();
  
        bool selected_for_rebuild;
        if (hr->is_humongous()) {
          bool const is_live = _cm->liveness(hr->humongous_start_region()->hrm_index()) > 0;
          selected_for_rebuild = tracking_policy->update_humongous_before_rebuild(hr, is_live);
--- 1011,1021 ----
      G1PrintRegionLivenessInfoClosure* _cl;
  
      uint _num_regions_selected_for_rebuild;  // The number of regions actually selected for rebuild.
  
      void update_remset_before_rebuild(HeapRegion* hr) {
!       G1RemSetTrackingPolicy* tracking_policy = _g1h->policy()->remset_tracker();
  
        bool selected_for_rebuild;
        if (hr->is_humongous()) {
          bool const is_live = _cm->liveness(hr->humongous_start_region()->hrm_index()) > 0;
          selected_for_rebuild = tracking_policy->update_humongous_before_rebuild(hr, is_live);
*** 1116,1126 ****
    G1CollectedHeap* _g1h;
  public:
    G1UpdateRemSetTrackingAfterRebuild(G1CollectedHeap* g1h) : _g1h(g1h) { }
  
    virtual bool do_heap_region(HeapRegion* r) {
!     _g1h->g1_policy()->remset_tracker()->update_after_rebuild(r);
      return false;
    }
  };
  
  void G1ConcurrentMark::remark() {
--- 1116,1126 ----
    G1CollectedHeap* _g1h;
  public:
    G1UpdateRemSetTrackingAfterRebuild(G1CollectedHeap* g1h) : _g1h(g1h) { }
  
    virtual bool do_heap_region(HeapRegion* r) {
!     _g1h->policy()->remset_tracker()->update_after_rebuild(r);
      return false;
    }
  };
  
  void G1ConcurrentMark::remark() {
*** 1130,1140 ****
    // have ended up here as the Remark VM operation has been scheduled already.
    if (has_aborted()) {
      return;
    }
  
!   G1Policy* g1p = _g1h->g1_policy();
    g1p->record_concurrent_mark_remark_start();
  
    double start = os::elapsedTime();
  
    verify_during_pause(G1HeapVerifier::G1VerifyRemark, VerifyOption_G1UsePrevMarking, "Remark before");
--- 1130,1140 ----
    // have ended up here as the Remark VM operation has been scheduled already.
    if (has_aborted()) {
      return;
    }
  
!   G1Policy* g1p = _g1h->policy();
    g1p->record_concurrent_mark_remark_start();
  
    double start = os::elapsedTime();
  
    verify_during_pause(G1HeapVerifier::G1VerifyRemark, VerifyOption_G1UsePrevMarking, "Remark before");
*** 1336,1346 ****
    // If a full collection has happened, we shouldn't do this.
    if (has_aborted()) {
      return;
    }
  
!   G1Policy* g1p = _g1h->g1_policy();
    g1p->record_concurrent_mark_cleanup_start();
  
    double start = os::elapsedTime();
  
    verify_during_pause(G1HeapVerifier::G1VerifyCleanup, VerifyOption_G1UsePrevMarking, "Cleanup before");
--- 1336,1346 ----
    // If a full collection has happened, we shouldn't do this.
    if (has_aborted()) {
      return;
    }
  
!   G1Policy* g1p = _g1h->policy();
    g1p->record_concurrent_mark_cleanup_start();
  
    double start = os::elapsedTime();
  
    verify_during_pause(G1HeapVerifier::G1VerifyCleanup, VerifyOption_G1UsePrevMarking, "Cleanup before");
*** 1367,1377 ****
    _total_cleanup_time += recent_cleanup_time;
    _cleanup_times.add(recent_cleanup_time);
  
    {
      GCTraceTime(Debug, gc, phases) debug("Finalize Concurrent Mark Cleanup", _gc_timer_cm);
!     _g1h->g1_policy()->record_concurrent_mark_cleanup_end();
    }
  }
  
  // 'Keep Alive' oop closure used by both serial parallel reference processing.
  // Uses the G1CMTask associated with a worker thread (for serial reference
--- 1367,1377 ----
    _total_cleanup_time += recent_cleanup_time;
    _cleanup_times.add(recent_cleanup_time);
  
    {
      GCTraceTime(Debug, gc, phases) debug("Finalize Concurrent Mark Cleanup", _gc_timer_cm);
!     _g1h->policy()->record_concurrent_mark_cleanup_end();
    }
  }
  
  // 'Keep Alive' oop closure used by both serial parallel reference processing.
  // Uses the G1CMTask associated with a worker thread (for serial reference
*** 1991,2001 ****
    }
  }
  #endif // PRODUCT
  
  void G1ConcurrentMark::rebuild_rem_set_concurrently() {
!   _g1h->g1_rem_set()->rebuild_rem_set(this, _concurrent_workers, _worker_id_offset);
  }
  
  void G1ConcurrentMark::print_stats() {
    if (!log_is_enabled(Debug, gc, stats)) {
      return;
--- 1991,2001 ----
    }
  }
  #endif // PRODUCT
  
  void G1ConcurrentMark::rebuild_rem_set_concurrently() {
!   _g1h->rem_set()->rebuild_rem_set(this, _concurrent_workers, _worker_id_offset);
  }
  
  void G1ConcurrentMark::print_stats() {
    if (!log_is_enabled(Debug, gc, stats)) {
      return;
*** 2570,2580 ****
    // steal work from the other G1CMTasks. It only makes sense to
    // enable stealing when the termination protocol is enabled
    // and do_marking_step() is not being called serially.
    bool do_stealing = do_termination && !is_serial;
  
!   double diff_prediction_ms = _g1h->g1_policy()->predictor().get_new_prediction(&_marking_step_diffs_ms);
    _time_target_ms = time_target_ms - diff_prediction_ms;
  
    // set up the variables that are used in the work-based scheme to
    // call the regular clock method
    _words_scanned = 0;
--- 2570,2580 ----
    // steal work from the other G1CMTasks. It only makes sense to
    // enable stealing when the termination protocol is enabled
    // and do_marking_step() is not being called serially.
    bool do_stealing = do_termination && !is_serial;
  
!   double diff_prediction_ms = _g1h->policy()->predictor().get_new_prediction(&_marking_step_diffs_ms);
    _time_target_ms = time_target_ms - diff_prediction_ms;
  
    // set up the variables that are used in the work-based scheme to
    // call the regular clock method
    _words_scanned = 0;