archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8148755: -XX:+HeapDumpAfterFullGC creates heap dump both before and after Full GC

Browse source 
Reviewed-by: mgerdin, brutisso, sangheki
This commit is contained in:
Claes Redestad 2016-02-03 14:15:57 +01:00
parent 978ec9c982
commit a95454d65c
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hotspot/src/share/vm/gc/shared/collectedHeap.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -571,10 +571,10 @@ void CollectedHeap::resize_all_tlabs() {
} }
} }
void CollectedHeap::full_gc_dump(GCTimer* timer, const char* when) { void CollectedHeap::full_gc_dump(GCTimer* timer, bool before) {
if (HeapDumpBeforeFullGC || HeapDumpAfterFullGC) { if ((HeapDumpBeforeFullGC && before) || (HeapDumpAfterFullGC && !before)) {
GCIdMarkAndRestore gc_id_mark; GCIdMarkAndRestore gc_id_mark;
FormatBuffer<> title("Heap Dump (%s full gc)", when); FormatBuffer<> title("Heap Dump (%s full gc)", before ? "before" : "after");
GCTraceTime(Info, gc) tm(title.buffer(), timer); GCTraceTime(Info, gc) tm(title.buffer(), timer);
HeapDumper::dump_heap(); HeapDumper::dump_heap();
} }
@ -582,7 +582,8 @@ void CollectedHeap::full_gc_dump(GCTimer* timer, const char* when) {
if (log.is_trace()) { if (log.is_trace()) {
ResourceMark rm; ResourceMark rm;
GCIdMarkAndRestore gc_id_mark; GCIdMarkAndRestore gc_id_mark;
FormatBuffer<> title("Class Histogram (%s full gc)", when); FormatBuffer<> title("Class Histogram (%s full gc)",
before ? "before" : "after");
GCTraceTime(Trace, gc, classhisto) tm(title.buffer(), timer); GCTraceTime(Trace, gc, classhisto) tm(title.buffer(), timer);
VM_GC_HeapInspection inspector(log.trace_stream(), false /* ! full gc */); VM_GC_HeapInspection inspector(log.trace_stream(), false /* ! full gc */);
inspector.doit(); inspector.doit();
@ -590,11 +591,11 @@ void CollectedHeap::full_gc_dump(GCTimer* timer, const char* when) {
} }
void CollectedHeap::pre_full_gc_dump(GCTimer* timer) { void CollectedHeap::pre_full_gc_dump(GCTimer* timer) {
full_gc_dump(timer, "before"); full_gc_dump(timer, true);
} }
void CollectedHeap::post_full_gc_dump(GCTimer* timer) { void CollectedHeap::post_full_gc_dump(GCTimer* timer) {
full_gc_dump(timer, "after"); full_gc_dump(timer, false);
} }
void CollectedHeap::initialize_reserved_region(HeapWord *start, HeapWord *end) { void CollectedHeap::initialize_reserved_region(HeapWord *start, HeapWord *end) {

4
hotspot/src/share/vm/gc/shared/collectedHeap.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -525,7 +525,7 @@ class CollectedHeap : public CHeapObj<mtInternal> {
// Generate any dumps preceding or following a full gc // Generate any dumps preceding or following a full gc
private: private:
void full_gc_dump(GCTimer* timer, const char* when); void full_gc_dump(GCTimer* timer, bool before);
public: public:
void pre_full_gc_dump(GCTimer* timer); void pre_full_gc_dump(GCTimer* timer);
void post_full_gc_dump(GCTimer* timer); void post_full_gc_dump(GCTimer* timer);