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

rev 47675 : [mq]: 8149127-rename-concurrentrefine-a
rev 47676 : imported patch 8149127-rename-concurrentrefine-b
rev 47677 : [mq]: 8149127-rename-concurrentrefine-b-stefanj-review

*** 21,33 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
- #include "gc/g1/concurrentG1Refine.hpp"
- #include "gc/g1/concurrentG1RefineThread.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1RemSet.inline.hpp"
  #include "gc/g1/g1RemSetSummary.hpp"
  #include "gc/g1/g1YoungRemSetSamplingThread.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
--- 21,33 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
+ #include "gc/g1/g1ConcurrentRefine.hpp"
+ #include "gc/g1/g1ConcurrentRefineThread.hpp"
  #include "gc/g1/g1RemSet.inline.hpp"
  #include "gc/g1/g1RemSetSummary.hpp"
  #include "gc/g1/g1YoungRemSetSamplingThread.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
*** 43,53 ****
    GetRSThreadVTimeClosure(G1RemSetSummary * summary) : ThreadClosure(), _summary(summary), _counter(0) {
      assert(_summary != NULL, "just checking");
    }
  
    virtual void do_thread(Thread* t) {
!     ConcurrentG1RefineThread* crt = (ConcurrentG1RefineThread*) t;
      _summary->set_rs_thread_vtime(_counter, crt->vtime_accum());
      _counter++;
    }
  };
  
--- 43,53 ----
    GetRSThreadVTimeClosure(G1RemSetSummary * summary) : ThreadClosure(), _summary(summary), _counter(0) {
      assert(_summary != NULL, "just checking");
    }
  
    virtual void do_thread(Thread* t) {
!     G1ConcurrentRefineThread* crt = (G1ConcurrentRefineThread*) t;
      _summary->set_rs_thread_vtime(_counter, crt->vtime_accum());
      _counter++;
    }
  };
  
*** 57,72 ****
    _num_processed_buf_mutator = dcqs.processed_buffers_mut();
    _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();
  
    _num_coarsenings = HeapRegionRemSet::n_coarsenings();
  
!   ConcurrentG1Refine * cg1r = G1CollectedHeap::heap()->concurrent_g1_refine();
    if (_rs_threads_vtimes != NULL) {
      GetRSThreadVTimeClosure p(this);
!     cg1r->worker_threads_do(&p);
    }
!   set_sampling_thread_vtime(cg1r->sampling_thread()->vtime_accum());
  }
  
  void G1RemSetSummary::set_rs_thread_vtime(uint thread, double value) {
    assert(_rs_threads_vtimes != NULL, "just checking");
    assert(thread < _num_vtimes, "just checking");
--- 57,72 ----
    _num_processed_buf_mutator = dcqs.processed_buffers_mut();
    _num_processed_buf_rs_threads = dcqs.processed_buffers_rs_thread();
  
    _num_coarsenings = HeapRegionRemSet::n_coarsenings();
  
!   G1ConcurrentRefine * cr = G1CollectedHeap::heap()->concurrent_refine();
    if (_rs_threads_vtimes != NULL) {
      GetRSThreadVTimeClosure p(this);
!     cr->worker_threads_do(&p);
    }
!   set_sampling_thread_vtime(cr->sampling_thread()->vtime_accum());
  }
  
  void G1RemSetSummary::set_rs_thread_vtime(uint thread, double value) {
    assert(_rs_threads_vtimes != NULL, "just checking");
    assert(thread < _num_vtimes, "just checking");
*** 83,93 ****
    _rem_set(NULL),
    _num_conc_refined_cards(0),
    _num_processed_buf_mutator(0),
    _num_processed_buf_rs_threads(0),
    _num_coarsenings(0),
!   _num_vtimes(ConcurrentG1Refine::thread_num()),
    _rs_threads_vtimes(NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC)),
    _sampling_thread_vtime(0.0f) {
  
    memset(_rs_threads_vtimes, 0, sizeof(double) * _num_vtimes);
  }
--- 83,93 ----
    _rem_set(NULL),
    _num_conc_refined_cards(0),
    _num_processed_buf_mutator(0),
    _num_processed_buf_rs_threads(0),
    _num_coarsenings(0),
!   _num_vtimes(G1ConcurrentRefine::thread_num()),
    _rs_threads_vtimes(NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC)),
    _sampling_thread_vtime(0.0f) {
  
    memset(_rs_threads_vtimes, 0, sizeof(double) * _num_vtimes);
  }
*** 96,106 ****
    _rem_set(rem_set),
    _num_conc_refined_cards(0),
    _num_processed_buf_mutator(0),
    _num_processed_buf_rs_threads(0),
    _num_coarsenings(0),
!   _num_vtimes(ConcurrentG1Refine::thread_num()),
    _rs_threads_vtimes(NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC)),
    _sampling_thread_vtime(0.0f) {
    update();
  }
  
--- 96,106 ----
    _rem_set(rem_set),
    _num_conc_refined_cards(0),
    _num_processed_buf_mutator(0),
    _num_processed_buf_rs_threads(0),
    _num_coarsenings(0),
!   _num_vtimes(G1ConcurrentRefine::thread_num()),
    _rs_threads_vtimes(NEW_C_HEAP_ARRAY(double, _num_vtimes, mtGC)),
    _sampling_thread_vtime(0.0f) {
    update();
  }