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

rev 49826 : imported patch 6672778-partial-queue-trimming
rev 49827 : imported patch 6672778-refactoring
rev 49828 : imported patch 6672778-stefanj-review

*** 26,41 ****
  
  #include "aot/aotLoader.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
- #include "gc/g1/bufferingOopClosure.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CodeBlobClosure.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RootClosures.hpp"
  #include "gc/g1/g1RootProcessor.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/shared/weakProcessor.hpp"
--- 26,41 ----
  
  #include "aot/aotLoader.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CodeBlobClosure.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1GCPhaseTimes.hpp"
+ #include "gc/g1/g1ParScanThreadState.inline.hpp"
  #include "gc/g1/g1Policy.hpp"
  #include "gc/g1/g1RootClosures.hpp"
  #include "gc/g1/g1RootProcessor.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/shared/weakProcessor.hpp"
*** 71,84 ****
      _process_strong_tasks(G1RP_PS_NumElements),
      _srs(n_workers),
      _lock(Mutex::leaf, "G1 Root Scanning barrier lock", false, Monitor::_safepoint_check_never),
      _n_workers_discovered_strong_classes(0) {}
  
! void G1RootProcessor::evacuate_roots(G1EvacuationRootClosures* closures, uint worker_i) {
!   double ext_roots_start = os::elapsedTime();
    G1GCPhaseTimes* phase_times = _g1h->g1_policy()->phase_times();
  
    process_java_roots(closures, phase_times, worker_i);
  
    // This is the point where this worker thread will not find more strong CLDs/nmethods.
    // Report this so G1 can synchronize the strong and weak CLDs/nmethods processing.
    if (closures->trace_metadata()) {
--- 71,86 ----
      _process_strong_tasks(G1RP_PS_NumElements),
      _srs(n_workers),
      _lock(Mutex::leaf, "G1 Root Scanning barrier lock", false, Monitor::_safepoint_check_never),
      _n_workers_discovered_strong_classes(0) {}
  
! void G1RootProcessor::evacuate_roots(G1ParScanThreadState* pss, uint worker_i) {
    G1GCPhaseTimes* phase_times = _g1h->g1_policy()->phase_times();
  
+   G1EvacPhaseTimesTracker timer(phase_times, pss, G1GCPhaseTimes::ExtRootScan, worker_i);
+ 
+   G1EvacuationRootClosures* closures = pss->closures();
    process_java_roots(closures, phase_times, worker_i);
  
    // This is the point where this worker thread will not find more strong CLDs/nmethods.
    // Report this so G1 can synchronize the strong and weak CLDs/nmethods processing.
    if (closures->trace_metadata()) {
*** 116,136 ****
      phase_times->record_time_secs(G1GCPhaseTimes::WaitForStrongCLD, worker_i, 0.0);
      phase_times->record_time_secs(G1GCPhaseTimes::WeakCLDRoots, worker_i, 0.0);
      assert(closures->second_pass_weak_clds() == NULL, "Should be null if not tracing metadata.");
    }
  
-   // Finish up any enqueued closure apps (attributed as object copy time).
-   closures->flush();
- 
-   double obj_copy_time_sec = closures->closure_app_seconds();
- 
-   phase_times->record_time_secs(G1GCPhaseTimes::ObjCopy, worker_i, obj_copy_time_sec);
- 
-   double ext_root_time_sec = os::elapsedTime() - ext_roots_start - obj_copy_time_sec;
- 
-   phase_times->record_time_secs(G1GCPhaseTimes::ExtRootScan, worker_i, ext_root_time_sec);
- 
    // During conc marking we have to filter the per-thread SATB buffers
    // to make sure we remove any oops into the CSet (which will show up
    // as implicitly live).
    {
      G1GCParPhaseTimesTracker x(phase_times, G1GCPhaseTimes::SATBFiltering, worker_i);
--- 118,127 ----