infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-20 03:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

8166191: Missing spaces in log message during heap expansion

Browse Source 
Reviewed-by: tschatzl
This commit is contained in:
Chihiro Ito 2017-05-12 11:38:20 +02:00 committed by Thomas Schatzl
parent afad47099c
commit 61b56ef305
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
View File

@ -1612,7 +1612,7 @@ bool G1CollectedHeap::expand(size_t expand_bytes, WorkGang* pretouch_workers, do
aligned_expand_bytes = align_size_up(aligned_expand_bytes,
HeapRegion::GrainBytes);
log_debug(gc, ergo, heap)("Expand the heap. requested expansion amount:" SIZE_FORMAT "B expansion amount:" SIZE_FORMAT "B",
log_debug(gc, ergo, heap)("Expand the heap. requested expansion amount: " SIZE_FORMAT "B expansion amount: " SIZE_FORMAT "B",
expand_bytes, aligned_expand_bytes);
if (is_maximal_no_gc()) {

19
hotspot/test/gc/g1/TestGCLogMessages.java
View File

@ -23,7 +23,7 @@
/*
* @test TestGCLogMessages
* @bug 8035406 8027295 8035398 8019342 8027959 8048179 8027962 8069330 8076463 8150630 8160055 8177059
* @bug 8035406 8027295 8035398 8019342 8027959 8048179 8027962 8069330 8076463 8150630 8160055 8177059 8166191
* @summary Ensure the output for a minor GC with G1
* includes the expected necessary messages.
* @key gc
@ -152,6 +152,7 @@ public class TestGCLogMessages {
new TestGCLogMessages().testNormalLogs();
new TestGCLogMessages().testWithToSpaceExhaustionLogs();
new TestGCLogMessages().testWithInitialMark();
new TestGCLogMessages().testExpandHeap();
}
private void testNormalLogs() throws Exception {
@ -227,6 +228,22 @@ public class TestGCLogMessages {
output.shouldHaveExitValue(0);
}
private void testExpandHeap() throws Exception {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
"-Xmx10M",
"-Xbootclasspath/a:.",
"-Xlog:gc+ergo+heap=debug",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:+WhiteBoxAPI",
GCTest.class.getName());
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldContain("Expand the heap. requested expansion amount: ");
output.shouldContain("B expansion amount: ");
output.shouldHaveExitValue(0);
}
static class GCTest {
private static byte[] garbage;
public static void main(String [] args) {