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

@@ -116,23 +116,18 @@
   size_t _cur_fast_reclaim_humongous_reclaimed;
 
   double _cur_verify_before_time_ms;
   double _cur_verify_after_time_ms;
 
-  // Helper methods for detailed logging
-  double info_line(const char* str, double value);
-  void debug_line(const char* str, double value);
-  void trace_line(const char* str, double value);
-  void trace_line(const char* str, size_t value);
-  void trace_phase_tasks(const char* indent, G1GCPhaseTimes::GCParPhases phase_id);
-  void trace_phase_counts(const char* indent, G1GCPhaseTimes::GCParPhases phase_id);
-  void debug_phase(G1GCPhaseTimes::GCParPhases phase_id);
-  void trace_phase(G1GCPhaseTimes::GCParPhases phase_id);
-  void trace_phase_no_sum(G1GCPhaseTimes::GCParPhases phase_id);
-
   void note_gc_end();
 
+  template <class T>
+  void details(T* phase, const char* indent);
+  void log_phase(WorkerDataArray<double>* phase, uint indent, outputStream* out, bool print_sum);
+  void debug_phase(WorkerDataArray<double>* phase);
+  void trace_phase(WorkerDataArray<double>* phase, bool print_sum = true);
+
  public:
   G1GCPhaseTimes(uint max_gc_threads);
   void note_gc_start(uint active_gc_threads);
   void print();
 

@@ -147,20 +142,10 @@
   // return the average time for a phase in milliseconds
   double average_time_ms(GCParPhases phase);
 
   size_t sum_thread_work_items(GCParPhases phase);
 
- private:
-  double get_time_ms(GCParPhases phase, uint worker_i);
-  double sum_time_ms(GCParPhases phase);
-  double min_time_ms(GCParPhases phase);
-  double max_time_ms(GCParPhases phase);
-  size_t get_thread_work_item(GCParPhases phase, uint worker_i);
-  double average_thread_work_items(GCParPhases phase);
-  size_t min_thread_work_items(GCParPhases phase);
-  size_t max_thread_work_items(GCParPhases phase);
-
  public:
 
   void record_clear_ct_time(double ms) {
     _cur_clear_ct_time_ms = ms;
   }