--- a/hotspot/src/share/vm/gc/shared/collectedHeap.hpp Thu Dec 10 23:02:31 2015 +0000
+++ b/hotspot/src/share/vm/gc/shared/collectedHeap.hpp Thu Dec 10 14:57:55 2015 +0100
@@ -58,18 +58,20 @@
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);
}
};
@@ -195,6 +197,8 @@
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.
@@ -519,6 +523,9 @@
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);
@@ -569,7 +576,7 @@
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