--- /dev/null	2019-07-26 15:01:22.000000000 -0700
+++ new/test/jdk/jdk/jfr/stress/javaagent/JavaAgent.java	2019-07-26 15:01:22.000000000 -0700
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2019, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.stress.javaagent;
+
+import java.lang.instrument.Instrumentation;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.jfr.Configuration;
+import jdk.jfr.Recording;
+import jdk.test.lib.jfr.EventNames;
+
+// The Java Agent used for testing.
+// The test execution happens here, including event generation.
+public class JavaAgent {
+    static final int NUMBER_OF_EVENT_GENERATOR_THREADS = 5;
+    static final int NUMBER_OF_EVENTS_PER_THREAD = 200*1000;
+    static final Path RECORDING_FILE_PREMAIN = Paths.get(".", "TestEventsFromJavaAgent-premain.jfr");
+    static final Path RECORDING_FILE_AGENTMAIN = Paths.get(".", "TestEventsFromJavaAgent-agentmain.jfr");
+
+    public static void premain(String agentArgs, Instrumentation inst) throws Exception {
+        System.out.println("premain(): entering");
+        if ("skipPremain".equals(agentArgs)) {
+            System.out.println("skipping premain()");
+            return;
+        }
+
+        test(RECORDING_FILE_PREMAIN);
+        System.out.println("premain(): done");
+    }
+
+    public static void agentmain(String agentArgs, Instrumentation inst) {
+        System.out.println("agentmain(): entering");
+
+        // The try/catch is needed here because, according to the documentation:
+        // "If the agentmain method throws an uncaught exception it will be ignored by JVM".
+        try {
+            test(RECORDING_FILE_AGENTMAIN);
+        } catch (Exception e) {
+            System.out.println("agentmain(): exception");
+            System.out.println(e.getMessage());
+            System.out.println(e.getStackTrace());
+        }
+
+        System.out.println("agentmain(): done");
+    }
+
+    public static void test(Path recordingFile) throws Exception {
+        Recording r = new Recording(Configuration.getConfiguration("default"));
+        r.enable(EventNames.JavaExceptionThrow);
+        r.setDumpOnExit(true);
+        r.start();
+
+        List<EventGenerator> generators = new ArrayList<EventGenerator>();
+        for (int i=0; i < NUMBER_OF_EVENT_GENERATOR_THREADS; i++) {
+            generators.add(new EventGenerator(NUMBER_OF_EVENTS_PER_THREAD));
+        }
+
+        for (EventGenerator g : generators) {
+            g.start();
+        }
+
+        for (EventGenerator g : generators) {
+            g.join();
+            g.checkErrors();
+        }
+
+        r.stop();
+        r.dump(recordingFile);
+    }
+
+
+    static class EventGenerator extends Thread {
+        Exception exception;
+        int nrOfEventsToGenerate = 1;
+
+        public EventGenerator(int nrOfEventsToGenerate) {
+            this.nrOfEventsToGenerate = nrOfEventsToGenerate;
+        }
+
+        void checkErrors() throws Exception {
+            if (exception != null) {
+                throw exception;
+            }
+        }
+
+        void generateEvent(int count) {
+            TestEvent ev = new TestEvent();
+            ev.msg = "Hello";
+            ev.count = count;
+            ev.thread = this;
+            ev.clazz = this.getClass();
+            ev.commit();
+        }
+
+        public void run() {
+            try {
+                for (int i=0; i<nrOfEventsToGenerate; i++) {
+                    generateEvent(i);
+                    if (i%1000 == 0) {
+                        try { Thread.sleep(1); } catch (InterruptedException e) {}
+                    }
+                }
+            } catch(Exception e) {
+                this.exception = e;
+            }
+        }
+    }
+}
--- /dev/null	2019-07-26 15:01:23.000000000 -0700
+++ new/test/jdk/jdk/jfr/stress/javaagent/SimpleLoop.java	2019-07-26 15:01:23.000000000 -0700
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019, 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.
+ */
+
+package jdk.jfr.stress.javaagent;
+
+
+public class SimpleLoop {
+
+    public static void main(String[] args) throws Exception {
+        if ((args.length < 1) || (args[0] == null)) {
+            throw new IllegalArgumentException("Expecting one argument: time to run (seconds)");
+        }
+        int howLong = Integer.parseInt(args[0]);
+
+        for (int i=0; i < howLong; i++) {
+            try { Thread.sleep(1000); } catch (InterruptedException e) {}
+            System.out.print(".");
+        }
+    }
+}
--- /dev/null	2019-07-26 15:01:24.000000000 -0700
+++ new/test/jdk/jdk/jfr/stress/javaagent/TestEvent.java	2019-07-26 15:01:23.000000000 -0700
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.stress.javaagent;
+
+import jdk.jfr.Event;
+import jdk.jfr.Description;
+import jdk.jfr.Label;
+
+
+@Label("TestEvent")
+@Description("Simple custom event")
+class TestEvent extends Event {
+    @Label("Message")
+    String msg;
+
+    @Label("Count")
+    int count;
+
+    @Label("Thread")
+    Thread thread;
+
+    @Label("Class")
+    Class clazz;
+}
--- /dev/null	2019-07-26 15:01:24.000000000 -0700
+++ new/test/jdk/jdk/jfr/stress/javaagent/TestEventsFromJavaAgent.java	2019-07-26 15:01:24.000000000 -0700
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2019, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.stress.javaagent;
+
+import com.sun.tools.attach.VirtualMachine;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.util.JarUtils;
+
+/**
+ * @test
+ * @key jfr
+ * @summary Test event generation from within java agent
+ * @requires vm.hasJFR
+ *
+ * @library /test/lib /test/jdk
+ * @modules java.instrument
+ *
+ * @build JavaAgent SimpleLoop
+ * @run driver jdk.jfr.stress.javaagent.TestEventsFromJavaAgent prepareAgent
+ * @run main/othervm -javaagent:StressEventsAgent.jar jdk.jfr.stress.javaagent.TestEventsFromJavaAgent test
+ */
+
+public class TestEventsFromJavaAgent {
+    public static void main(String... args) throws Exception {
+        if(args[0].equals("prepareAgent")) {
+            prepareAgent();
+            return;
+        }
+
+        System.out.println("Hello from TestEventsFromJavaAgent");
+
+        // Test Case 01: the test runs in premain() in this process.
+        // The recording file can get fairly large; delete it upon exit.
+        JavaAgent.RECORDING_FILE_PREMAIN.toFile().deleteOnExit();
+        validateRecording(JavaAgent.RECORDING_FILE_PREMAIN);
+
+
+        // Test Case 02: the test runs in agentmain() in a child process.
+        testWithDynamicallyLoadedAgent();
+        JavaAgent.RECORDING_FILE_AGENTMAIN.toFile().deleteOnExit();
+        validateRecording(JavaAgent.RECORDING_FILE_AGENTMAIN);
+    }
+
+
+    // Run simple loop in a child process,
+    // attach and dynamically load the agent to record events.
+    private static void testWithDynamicallyLoadedAgent() throws Exception {
+        ProcessBuilder pb =
+            ProcessTools.createJavaProcessBuilder("jdk.jfr.stress.javaagent.SimpleLoop", "20");
+        Process p = pb.start();
+
+        VirtualMachine vm = VirtualMachine.attach("" + p.pid());
+        vm.loadAgent("StressEventsAgent.jar");
+        vm.detach();
+
+        p.waitFor();
+        OutputAnalyzer out = new OutputAnalyzer(p);
+        System.out.println("========= child process output:");
+        System.out.println(out.getOutput());
+        System.out.println("========= ");
+        out.shouldHaveExitValue(0)
+            .shouldContain("agentmain(): done")
+            .shouldNotContain("agentmain(): exception");
+    }
+
+    private static void prepareAgent() throws Exception {
+        Manifest mf = new Manifest();
+        Attributes attrs = mf.getMainAttributes();
+        attrs.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+        attrs.putValue("Premain-Class", "jdk.jfr.stress.javaagent.JavaAgent");
+        attrs.putValue("Agent-Class",   "jdk.jfr.stress.javaagent.JavaAgent");
+
+        JarUtils.createJarFile(Paths.get(".", "StressEventsAgent.jar"), mf,
+                               Paths.get(Utils.TEST_CLASSES),
+                               Paths.get(Utils.TEST_CLASSES, "jdk", "jfr", "stress", "javaagent",
+                                         "JavaAgent.class"));
+    }
+
+    private static void validateRecording(Path recordingFile) throws Exception {
+        String eventName = "jdk.jfr.stress.javaagent.TestEvent";
+        long testEventCount = RecordingFile.readAllEvents(recordingFile).stream()
+            .filter(e -> e.getEventType().getName().equals(eventName))
+            .count();
+
+        long expectedEventCount = JavaAgent.NUMBER_OF_EVENT_GENERATOR_THREADS *
+            JavaAgent.NUMBER_OF_EVENTS_PER_THREAD;
+        Asserts.assertTrue(testEventCount == expectedEventCount,
+                           "Mismatch in TestEvent count");
+    }
+}