src/share/vm/gc/g1/g1GCPhaseTimes.hpp

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

*** 109,118 ****
--- 109,120 ----
  
    double _recorded_redirty_logged_cards_time_ms;
  
    double _recorded_preserve_cm_referents_time_ms;
  
+   double _recorded_merge_pss_time_ms;
+ 
    double _recorded_young_free_cset_time_ms;
    double _recorded_non_young_free_cset_time_ms;
  
    double _cur_fast_reclaim_humongous_time_ms;
    double _cur_fast_reclaim_humongous_register_time_ms;
*** 239,248 ****
--- 241,254 ----
  
    void record_preserve_cm_referents_time_ms(double time_ms) {
      _recorded_preserve_cm_referents_time_ms = time_ms;
    }
  
+   void record_merge_pss_time_ms(double time_ms) {
+     _recorded_merge_pss_time_ms = time_ms;
+   }
+ 
    void record_cur_collection_start_sec(double time_ms) {
      _cur_collection_start_sec = time_ms;
    }
  
    void record_verify_before_time_ms(double time_ms) {