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

rev 49678 : imported patch 8200426-sangheon-review
rev 49680 : imported patch 6672778-partial-queue-trimming
rev 49681 : [mq]: 6672778-refactoring

*** 1835,1845 ****
    DirtyCardQueueSet& dcqs = JavaThread::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.
--- 1835,1845 ----
    DirtyCardQueueSet& dcqs = JavaThread::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.
*** 3124,3134 ****
        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.
--- 3124,3134 ----
        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, 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.