8236938: [TESTBUG] JFR event MetaspaceAllocationFailure is not tested
New test for MetaspaceAllocationFailure
Reviewed-by: hseigel, stuefe
diff --git a/test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspace.java b/test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspace.java
index 10dafab..61cebb5 100644
--- a/test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspace.java
+++ b/test/hotspot/jtreg/runtime/Metaspace/FragmentMetaspace.java
@@ -23,13 +23,14 @@
/**
* @test
- * @library /runtime/testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.compiler
* @run main/othervm/timeout=200 -Xmx1g FragmentMetaspace
*/
import java.io.IOException;
+import jdk.test.lib.classloader.GeneratingCompilingClassLoader;
/**
* Test that tries to fragment the native memory used by class loaders.
@@ -53,7 +54,7 @@
long startTime = System.currentTimeMillis();
for (int i = 0; System.currentTimeMillis() < startTime + time && i < iterations; ++i) {
try {
- GeneratedClassLoader gcl = new GeneratedClassLoader();
+ GeneratingCompilingClassLoader gcl = new GeneratingCompilingClassLoader();
// getGeneratedClasses throws a RuntimeException in cases where
// the javac exit code is not 0. If the original reason for the exception is
diff --git a/test/jdk/jdk/jfr/event/runtime/TestMetaspaceAllocationFailure.java b/test/jdk/jdk/jfr/event/runtime/TestMetaspaceAllocationFailure.java
new file mode 100644
index 0000000..be82949
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/runtime/TestMetaspaceAllocationFailure.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2020, 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
+ * @summary Test jdk.MetaspaceAllocationFailure event
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc java.compiler
+ * @run main/othervm -Xmx1G -XX:MaxMetaspaceSize=200M
+ * -XX:StartFlightRecording -Xshare:off
+ * jdk.jfr.event.runtime.TestMetaspaceAllocationFailure
+ * @run main/othervm -Xmx1G -XX:CompressedClassSpaceSize=200M
+ * -XX:StartFlightRecording -Xshare:off
+ * jdk.jfr.event.runtime.TestMetaspaceAllocationFailure
+ */
+package jdk.jfr.event.runtime;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.classloader.GeneratingCompilingClassLoader;
+import jdk.test.lib.Asserts;
+
+
+public class TestMetaspaceAllocationFailure {
+ public static void main(String... args) throws Exception {
+ AtomicBoolean eventArrived = new AtomicBoolean(false);
+ try (RecordingStream r = new RecordingStream()) {
+ r.onEvent("jdk.MetaspaceAllocationFailure", e -> eventArrived.set(true));
+ r.startAsync();
+
+ try {
+ while (!eventArrived.get()) {
+ GeneratingCompilingClassLoader cl = new GeneratingCompilingClassLoader();
+ cl.getGeneratedClasses(50, 20);
+ Thread.sleep(100);
+ System.out.println("Iteration");
+ }
+ System.gc();
+ System.out.println("main(): Event arrived");
+ } catch (OutOfMemoryError e) {
+ System.gc();
+ System.out.println("main(): OutOfMemoryError (expected): " + e.getMessage());
+ }
+
+ Asserts.assertTrue(eventArrived.get());
+ }
+ }
+}
diff --git a/test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java b/test/lib/jdk/test/lib/classloader/GeneratingCompilingClassLoader.java
similarity index 95%
rename from test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java
rename to test/lib/jdk/test/lib/classloader/GeneratingCompilingClassLoader.java
index 7aad705..34e3a25 100644
--- a/test/hotspot/jtreg/runtime/testlibrary/GeneratedClassLoader.java
+++ b/test/lib/jdk/test/lib/classloader/GeneratingCompilingClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, 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
@@ -20,6 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+package jdk.test.lib.classloader;
import java.io.DataInputStream;
import java.io.ByteArrayOutputStream;
@@ -38,7 +39,7 @@
* Some efforts are made to make the class instances unique and of not insignificant
* size.
*/
-public class GeneratedClassLoader extends ClassLoader {
+public class GeneratingCompilingClassLoader extends ClassLoader {
/**
* Holds a pair of class bytecodes and class name (for use with defineClass).
*/
@@ -59,7 +60,7 @@
* the generated classes.
*/
private static boolean deleteFiles = Boolean.parseBoolean(
- System.getProperty("GeneratedClassLoader.deleteFiles", "true"));
+ System.getProperty("GeneratingCompilingClassLoader.deleteFiles", "true"));
private static String bigstr =
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
@@ -86,7 +87,7 @@
private JavaCompiler javac;
private String nameBase;
- public GeneratedClassLoader() {
+ public GeneratingCompilingClassLoader() {
javac = ToolProvider.getSystemJavaCompiler();
nameBase = "TestSimpleClass";
}
