*** old/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Fri May  2 18:08:05 2014
--- new/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp	Fri May  2 18:08:05 2014

*** 39,49 ****
--- 39,49 ----
  class G1GCPhaseTimes;
  
  // TraceGen0Time collects data on _both_ young and mixed evacuation pauses
  // (the latter may contain non-young regions - i.e. regions that are
  // technically in Gen1) while TraceGen1Time collects data about full GCs.
! class TraceGen0TimeData : public CHeapObj<mtGC> {
! class TraceYoungGenTimeData : public CHeapObj<mtGC> {
   private:
    unsigned  _young_pause_num;
    unsigned  _mixed_pause_num;
  
    NumberSeq _all_stop_world_times_ms;

*** 64,83 ****
--- 64,83 ----
  
    void print_summary(const char* str, const NumberSeq* seq) const;
    void print_summary_sd(const char* str, const NumberSeq* seq) const;
  
  public:
!    TraceGen0TimeData() : _young_pause_num(0), _mixed_pause_num(0) {};
!    TraceYoungGenTimeData() : _young_pause_num(0), _mixed_pause_num(0) {};
    void record_start_collection(double time_to_stop_the_world_ms);
    void record_yield_time(double yield_time_ms);
    void record_end_collection(double pause_time_ms, G1GCPhaseTimes* phase_times);
    void increment_young_collection_count();
    void increment_mixed_collection_count();
    void print() const;
  };
  
! class TraceGen1TimeData : public CHeapObj<mtGC> {
! class TraceOldGenTimeData : public CHeapObj<mtGC> {
   private:
    NumberSeq _all_full_gc_times;
  
   public:
    void record_full_collection(double full_gc_time_ms);

*** 185,196 ****
--- 185,196 ----
    TruncatedSeq* _recent_gc_times_ms;
  
    TruncatedSeq* _concurrent_mark_remark_times_ms;
    TruncatedSeq* _concurrent_mark_cleanup_times_ms;
  
!   TraceGen0TimeData _trace_gen0_time_data;
!   TraceGen1TimeData _trace_gen1_time_data;
!   TraceYoungGenTimeData _trace_young_gen_time_data;
!   TraceOldGenTimeData   _trace_old_gen_time_data;
  
    double _stop_world_start;
  
    // indicates whether we are in young or mixed GC mode
    bool _gcs_are_young;