src/share/vm/gc/shared/gcTrace.hpp

*** 50,81 ****
  class TimePartitions;
  class BoolObjectClosure;
  
  class SharedGCInfo VALUE_OBJ_CLASS_SPEC {
   private:
-   GCId _gc_id;
    GCName _name;
    GCCause::Cause _cause;
    Ticks     _start_timestamp;
    Ticks     _end_timestamp;
    Tickspan  _sum_of_pauses;
    Tickspan  _longest_pause;
  
   public:
    SharedGCInfo(GCName name) :
-     _gc_id(GCId::undefined()),
      _name(name),
      _cause(GCCause::_last_gc_cause),
      _start_timestamp(),
      _end_timestamp(),
      _sum_of_pauses(),
      _longest_pause() {
    }
  
-   void set_gc_id(GCId gc_id) { _gc_id = gc_id; }
-   const GCId& gc_id() const { return _gc_id; }
- 
    void set_start_timestamp(const Ticks& timestamp) { _start_timestamp = timestamp; }
    const Ticks start_timestamp() const { return _start_timestamp; }
  
    void set_end_timestamp(const Ticks& timestamp) { _end_timestamp = timestamp; }
    const Ticks end_timestamp() const { return _end_timestamp; }
--- 50,76 ----
*** 126,137 ****
    void report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions);
    void report_gc_heap_summary(GCWhen::Type when, const GCHeapSummary& heap_summary) const;
    void report_metaspace_summary(GCWhen::Type when, const MetaspaceSummary& metaspace_summary) const;
    void report_gc_reference_stats(const ReferenceProcessorStats& rp) const;
    void report_object_count_after_gc(BoolObjectClosure* object_filter) NOT_SERVICES_RETURN;
-   bool has_reported_gc_start() const;
-   const GCId& gc_id() { return _shared_gc_info.gc_id(); }
  
   protected:
    GCTracer(GCName name) : _shared_gc_info(name) {}
    void report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp);
    virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
--- 121,130 ----
*** 240,253 ****
    ParNewTracer() : YoungGCTracer(ParNew) {}
  };
  
  #if INCLUDE_ALL_GCS
  class G1MMUTracer : public AllStatic {
!   static void send_g1_mmu_event(const GCId& gcId, double timeSlice, double gcTime, double maxTime);
  
   public:
!   static void report_mmu(const GCId& gcId, double timeSlice, double gcTime, double maxTime);
  };
  
  class G1NewTracer : public YoungGCTracer {
    G1YoungGCInfo _g1_young_gc_info;
  
--- 233,246 ----
    ParNewTracer() : YoungGCTracer(ParNew) {}
  };
  
  #if INCLUDE_ALL_GCS
  class G1MMUTracer : public AllStatic {
!   static void send_g1_mmu_event(double timeSlice, double gcTime, double maxTime);
  
   public:
!   static void report_mmu(double timeSlice, double gcTime, double maxTime);
  };
  
  class G1NewTracer : public YoungGCTracer {
    G1YoungGCInfo _g1_young_gc_info;