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

rev 49681 : imported patch 6672778-partial-queue-trimming
rev 49682 : imported patch 6672778-refactoring
rev 49683 : imported patch 6672778-stefanj-review
rev 49684 : imported patch 6672778-inconsistent-time-fixes
rev 49691 : [mq]: 8201596-weak-processing-missing

@@ -130,10 +130,11 @@
   _cur_derived_pointer_table_update_time_ms = 0.0;
   _cur_clear_ct_time_ms = 0.0;
   _cur_expand_heap_time_ms = 0.0;
   _cur_ref_proc_time_ms = 0.0;
   _cur_ref_enq_time_ms = 0.0;
+  _cur_weak_ref_proc_time_ms = 0.0;
   _cur_collection_start_sec = 0.0;
   _root_region_scan_wait_time_ms = 0.0;
   _external_accounted_time_ms = 0.0;
   _recorded_clear_claimed_marks_time_ms = 0.0;
   _recorded_young_cset_choice_time_ms = 0.0;

@@ -384,10 +385,11 @@
                                     _cur_evac_fail_remove_self_forwards;
   const double sum_ms = evac_fail_handling +
                         _cur_collection_code_root_fixup_time_ms +
                         _recorded_preserve_cm_referents_time_ms +
                         _cur_ref_proc_time_ms +
+                        _cur_weak_ref_proc_time_ms +
                         _cur_ref_enq_time_ms +
                         _cur_clear_ct_time_ms +
                         _recorded_merge_pss_time_ms +
                         _cur_strong_code_root_purge_time_ms +
                         _recorded_redirty_logged_cards_time_ms +

@@ -404,10 +406,12 @@
   trace_phase(_gc_par_phases[PreserveCMReferents]);
 
   debug_time_for_reference("Reference Processing", _cur_ref_proc_time_ms);
   _ref_phase_times.print_all_references(2, false);
 
+  debug_time("Weak Processing", _cur_weak_ref_proc_time_ms);
+
   if (G1StringDedup::is_enabled()) {
     debug_time("String Dedup Fixup", _cur_string_dedup_fixup_time_ms);
     debug_phase(_gc_par_phases[StringDedupQueueFixup]);
     debug_phase(_gc_par_phases[StringDedupTableFixup]);
   }