infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-13 20:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8052170: G1 asserts at collection exit with -XX:-G1DeferredRSUpdate

Browse Source 
Do not try to verify timing measures for the redirty logged cards phase when it is not executed.

Reviewed-by: brutisso, jmasa
This commit is contained in:
Thomas Schatzl 2014-08-07 22:28:16 +02:00
parent ae0190f121
commit 24bee82e67
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
View File

@ -237,8 +237,10 @@ void G1GCPhaseTimes::note_gc_end() {
_last_gc_worker_times_ms.verify();
_last_gc_worker_other_times_ms.verify();
_last_redirty_logged_cards_time_ms.verify();
_last_redirty_logged_cards_processed_cards.verify();
if (G1DeferredRSUpdate) {
_last_redirty_logged_cards_time_ms.verify();
_last_redirty_logged_cards_processed_cards.verify();
}
}
void G1GCPhaseTimes::note_string_dedup_fixup_start() {

3
hotspot/test/gc/g1/TestDeferredRSUpdate.java
View File

@ -23,7 +23,7 @@
/*
* @test TestDeferredRSUpdate
* @bug 8040977
* @bug 8040977 8052170
* @summary Ensure that running with -XX:-G1DeferredRSUpdate does not crash the VM
* @key gc
* @library /testlibrary
@ -38,6 +38,7 @@ public class TestDeferredRSUpdate {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UseG1GC",
"-Xmx10M",
"-XX:+PrintGCDetails",
// G1DeferredRSUpdate is a develop option, but we cannot limit execution of this test to only debug VMs.
"-XX:+IgnoreUnrecognizedVMOptions",
"-XX:-G1DeferredRSUpdate",