This repository has been archived by the owner on Sep 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 143
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8268470: CDS dynamic dump asserts with JFR RecordingStream
Reviewed-by: minqi, iklam
- Loading branch information
1 parent
e39346e
commit 01054e6
Showing
4 changed files
with
170 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/JFRDynamicCDS.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
* | ||
*/ | ||
|
||
/* | ||
* @test | ||
* @bug 8268470 | ||
* @summary Test dynamic CDS with JFR recording. | ||
* Dynamic dump should skip the class such as jdk/jfr/events/FileReadEvent | ||
* if one of its super classes has been redefined during JFR startup. | ||
* @requires vm.cds | ||
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds | ||
* /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes | ||
* @build JFRDynamicCDSApp sun.hotspot.WhiteBox | ||
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar jfr_dynamic_cds_app.jar JFRDynamicCDSApp JFRDynamicCDSApp$StressEvent | ||
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox | ||
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. JFRDynamicCDS | ||
*/ | ||
|
||
import jdk.test.lib.helpers.ClassFileInstaller; | ||
|
||
public class JFRDynamicCDS extends DynamicArchiveTestBase { | ||
public static void main(String[] args) throws Exception { | ||
runTest(JFRDynamicCDS::test); | ||
} | ||
|
||
static void test() throws Exception { | ||
String topArchiveName = getNewArchiveName(); | ||
String appJar = ClassFileInstaller.getJarPath("jfr_dynamic_cds_app.jar"); | ||
String mainClass = "JFRDynamicCDSApp"; | ||
dump(topArchiveName, | ||
"-Xlog:class+load,cds=debug", | ||
"-cp", appJar, mainClass) | ||
.assertNormalExit(output -> { | ||
output.shouldHaveExitValue(0) | ||
.shouldMatch("Skipping.jdk/jfr/events.*Has.been.redefined"); | ||
}); | ||
|
||
run(topArchiveName, | ||
"-Xlog:class+load=info", | ||
"-cp", appJar, mainClass) | ||
.assertNormalExit(output -> { | ||
output.shouldHaveExitValue(0) | ||
.shouldMatch(".class.load. jdk.jfr.events.*source:.*jrt:/jdk.jfr") | ||
.shouldContain("[class,load] JFRDynamicCDSApp source: shared objects file (top)"); | ||
}); | ||
} | ||
} |
82 changes: 82 additions & 0 deletions
82
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/test-classes/JFRDynamicCDSApp.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/* | ||
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
* | ||
*/ | ||
import java.nio.file.Paths; | ||
import jdk.jfr.Configuration; | ||
import jdk.jfr.Description; | ||
import jdk.jfr.Label; | ||
import jdk.jfr.Name; | ||
import jdk.jfr.Recording; | ||
import jdk.jfr.consumer.RecordingStream; | ||
|
||
public class JFRDynamicCDSApp { | ||
public static void main(String args[]) throws Exception { | ||
RecordingStream rs = new RecordingStream(); | ||
rs.enable("JFRDynamicCDS.StressEvent"); | ||
rs.startAsync(); | ||
|
||
Recording recording = startRecording(); | ||
loop(); | ||
recording.stop(); | ||
recording.close(); | ||
|
||
rs.close(); | ||
} | ||
|
||
static Recording startRecording() throws Exception { | ||
Configuration configuration = Configuration.getConfiguration("default"); | ||
Recording recording = new Recording(configuration); | ||
|
||
recording.setName("internal"); | ||
recording.enable(StressEvent.class); | ||
recording.setDestination(Paths.get("JFRDynamicCDS.jfr")); | ||
recording.start(); | ||
return recording; | ||
} | ||
|
||
|
||
static void loop() { | ||
for (int i=0; i<100; i++) { | ||
StressEvent event = new StressEvent(); | ||
event.iteration = i; | ||
event.description = "Stressful Event, take it easy!"; | ||
event.customClazz = StressEvent.class; | ||
event.value = i; | ||
event.commit(); | ||
} | ||
} | ||
|
||
|
||
/** | ||
* Internal StressEvent class. | ||
*/ | ||
@Label("Stress Event") | ||
@Description("A duration event with 4 entries") | ||
@Name("JFRDynamicCDS.StressEvent") | ||
public static class StressEvent extends jdk.jfr.Event { | ||
public Class<?> customClazz; | ||
public String description; | ||
public int iteration; | ||
public double value; | ||
} | ||
} |
01054e6
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues