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

@@ -56,22 +56,24 @@
 
  public:
   GCMessage() {}
 };
 
+class CollectedHeap;
+
 class GCHeapLog : public EventLogBase<GCMessage> {
  private:
-  void log_heap(bool before);
+  void log_heap(CollectedHeap* heap, bool before);
 
  public:
   GCHeapLog() : EventLogBase<GCMessage>("GC Heap History") {}
 
-  void log_heap_before() {
-    log_heap(true);
+  void log_heap_before(CollectedHeap* heap) {
+    log_heap(heap, true);
   }
-  void log_heap_after() {
-    log_heap(false);
+  void log_heap_after(CollectedHeap* heap) {
+    log_heap(heap, false);
   }
 };
 
 //
 // CollectedHeap

@@ -193,10 +195,12 @@
     return _filler_array_max_size;
   }
 
   virtual Name kind() const = 0;
 
+  virtual const char* name() const = 0;
+
   /**
    * Returns JNI error code JNI_ENOMEM if memory could not be allocated,
    * and JNI_OK on success.
    */
   virtual jint initialize() = 0;

@@ -517,10 +521,13 @@
 
   // Perform any cleanup actions necessary before allowing a verification.
   virtual void prepare_for_verify() = 0;
 
   // Generate any dumps preceding or following a full gc
+ private:
+  void full_gc_dump(GCTimer* timer, const char* when);
+ public:
   void pre_full_gc_dump(GCTimer* timer);
   void post_full_gc_dump(GCTimer* timer);
 
   VirtualSpaceSummary create_heap_space_summary();
   GCHeapSummary create_heap_summary();

@@ -567,11 +574,11 @@
 
   void trace_heap_before_gc(const GCTracer* gc_tracer);
   void trace_heap_after_gc(const GCTracer* gc_tracer);
 
   // Heap verification
-  virtual void verify(bool silent, VerifyOption option) = 0;
+  virtual void verify(VerifyOption option) = 0;
 
   // Non product verification and debugging.
 #ifndef PRODUCT
   // Support for PromotionFailureALot.  Return true if it's time to cause a
   // promotion failure.  The no-argument version uses