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

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

*** 26,36 ****
  #include "classfile/metadataOnStackMark.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
  #include "code/codeCache.hpp"
  #include "code/icBuffer.hpp"
- #include "gc/g1/bufferingOopClosure.hpp"
  #include "gc/g1/g1Allocator.inline.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/g1CollectionSet.hpp"
  #include "gc/g1/g1CollectorPolicy.hpp"
--- 26,35 ----
*** 1838,1848 ****
    DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
    size_t n_completed_buffers = 0;
    while (dcqs.apply_closure_during_gc(cl, worker_i)) {
      n_completed_buffers++;
    }
!   g1_policy()->phase_times()->record_thread_work_item(G1GCPhaseTimes::UpdateRS, worker_i, n_completed_buffers);
    dcqs.clear_n_completed_buffers();
    assert(!dcqs.completed_buffers_exist_dirty(), "Completed buffers exist!");
  }
  
  // Computes the sum of the storage used by the various regions.
--- 1837,1847 ----
    DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set();
    size_t n_completed_buffers = 0;
    while (dcqs.apply_closure_during_gc(cl, worker_i)) {
      n_completed_buffers++;
    }
!   g1_policy()->phase_times()->record_thread_work_item(G1GCPhaseTimes::UpdateRS, worker_i, n_completed_buffers, G1GCPhaseTimes::UpdateRSProcessedBuffers);
    dcqs.clear_n_completed_buffers();
    assert(!dcqs.completed_buffers_exist_dirty(), "Completed buffers exist!");
  }
  
  // Computes the sum of the storage used by the various regions.
*** 3127,3145 ****
        G1ParScanThreadState*           pss = _pss->state_for_worker(worker_id);
        pss->set_ref_processor(rp);
  
        double start_strong_roots_sec = os::elapsedTime();
  
!       _root_processor->evacuate_roots(pss->closures(), worker_id);
  
        // We pass a weak code blobs closure to the remembered set scanning because we want to avoid
        // treating the nmethods visited to act as roots for concurrent marking.
        // We only want to make sure that the oops in the nmethods are adjusted with regard to the
        // objects copied by the current evacuation.
!       _g1h->g1_rem_set()->oops_into_collection_set_do(pss,
!                                                       pss->closures()->weak_codeblobs(),
!                                                       worker_id);
  
        double strong_roots_sec = os::elapsedTime() - start_strong_roots_sec;
  
        double term_sec = 0.0;
        size_t evac_term_attempts = 0;
--- 3126,3142 ----
        G1ParScanThreadState*           pss = _pss->state_for_worker(worker_id);
        pss->set_ref_processor(rp);
  
        double start_strong_roots_sec = os::elapsedTime();
  
!       _root_processor->evacuate_roots(pss, worker_id);
  
        // We pass a weak code blobs closure to the remembered set scanning because we want to avoid
        // treating the nmethods visited to act as roots for concurrent marking.
        // We only want to make sure that the oops in the nmethods are adjusted with regard to the
        // objects copied by the current evacuation.
!       _g1h->g1_rem_set()->oops_into_collection_set_do(pss, worker_id);
  
        double strong_roots_sec = os::elapsedTime() - start_strong_roots_sec;
  
        double term_sec = 0.0;
        size_t evac_term_attempts = 0;
*** 3149,3161 ****
          evac.do_void();
  
          evac_term_attempts = evac.term_attempts();
          term_sec = evac.term_time();
          double elapsed_sec = os::elapsedTime() - start;
!         _g1h->g1_policy()->phase_times()->add_time_secs(G1GCPhaseTimes::ObjCopy, worker_id, elapsed_sec - term_sec);
!         _g1h->g1_policy()->phase_times()->record_time_secs(G1GCPhaseTimes::Termination, worker_id, term_sec);
!         _g1h->g1_policy()->phase_times()->record_thread_work_item(G1GCPhaseTimes::Termination, worker_id, evac_term_attempts);
        }
  
        assert(pss->queue_is_empty(), "should be empty");
  
        if (log_is_enabled(Debug, gc, task, stats)) {
--- 3146,3160 ----
          evac.do_void();
  
          evac_term_attempts = evac.term_attempts();
          term_sec = evac.term_time();
          double elapsed_sec = os::elapsedTime() - start;
! 
!         G1GCPhaseTimes* p = _g1h->g1_policy()->phase_times();
!         p->add_time_secs(G1GCPhaseTimes::ObjCopy, worker_id, elapsed_sec - term_sec);
!         p->record_time_secs(G1GCPhaseTimes::Termination, worker_id, term_sec);
!         p->record_thread_work_item(G1GCPhaseTimes::Termination, worker_id, evac_term_attempts);
        }
  
        assert(pss->queue_is_empty(), "should be empty");
  
        if (log_is_enabled(Debug, gc, task, stats)) {