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

rev 10309 : imported patch 8076463-add-logging-for-preserve-cm-tasks
rev 10310 : [mq]: 8150630-add-logging-for-merge-pss

@@ -4592,10 +4592,16 @@
 
   double ref_enq_time = os::elapsedTime() - ref_enq_start;
   g1_policy()->phase_times()->record_ref_enq_time(ref_enq_time * 1000.0);
 }
 
+void G1CollectedHeap::merge_per_thread_state_info(G1ParScanThreadStateSet* per_thread_states) {
+  double merge_pss_time_start = os::elapsedTime();
+  per_thread_states->flush();
+  g1_policy()->phase_times()->record_merge_pss_time_ms((os::elapsedTime() - merge_pss_time_start) * 1000.0);
+}
+
 void G1CollectedHeap::pre_evacuate_collection_set() {
   _expand_heap_after_alloc_failure = true;
   _evacuation_failed = false;
 
   // Disable the hot card cache.

@@ -4694,11 +4700,11 @@
     g1_policy()->phase_times()->record_ref_enq_time(0);
   }
 
   _allocator->release_gc_alloc_regions(evacuation_info);
 
-  per_thread_states->flush();
+  merge_per_thread_state_info(per_thread_states);
 
   record_obj_copy_mem_stats();
 
   _survivor_evac_stats.adjust_desired_plab_sz();
   _old_evac_stats.adjust_desired_plab_sz();