--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java Tue Oct 01 18:47:30 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java Wed Oct 02 19:26:33 2019 +0200
@@ -238,7 +238,6 @@
}
private void execute() {
- JVM.getJVM().exclude(Thread.currentThread());
try {
process();
} catch (IOException ioe) {
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java Tue Oct 01 18:47:30 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java Wed Oct 02 19:26:33 2019 +0200
@@ -98,7 +98,6 @@
private final MetadataDescriptor metadata;
private final TimeConverter timeConverter;
private final MetadataDescriptor previousMetadata;
- private final long pollInterval;
private final LongMap<ConstantLookup> constantLookups;
private LongMap<Type> typeMap;
@@ -125,13 +124,11 @@
this.input = header.getInput();
this.chunkHeader = header;
if (previous == null) {
- this.pollInterval = 1000;
this.constantLookups = new LongMap<>();
this.previousMetadata = null;
} else {
this.constantLookups = previous.constantLookups;
this.previousMetadata = previous.metadata;
- this.pollInterval = previous.pollInterval;
this.configuration = previous.configuration;
}
this.metadata = header.readMetadata(previousMetadata);
@@ -288,7 +285,7 @@
if (chunkHeader.isFinished()) {
return true;
}
- Utils.waitFlush(pollInterval);
+ Utils.waitFlush(1000);
}
}
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java Tue Oct 01 18:47:30 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java Wed Oct 02 19:26:33 2019 +0200
@@ -34,6 +34,7 @@
import java.util.Objects;
import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.internal.JVM;
import jdk.jfr.internal.Utils;
import jdk.jfr.internal.consumer.ChunkParser.ParserConfiguration;
@@ -80,6 +81,15 @@
@Override
protected void process() throws IOException {
+ try {
+ JVM.getJVM().exclude(Thread.currentThread());
+ processRecursionSafe();
+ } finally {
+ JVM.getJVM().include(Thread.currentThread());
+ }
+ }
+
+ protected void processRecursionSafe() throws IOException {
Dispatcher disp = dispatcher();
Path path;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestRecursive.java Wed Oct 02 19:26:33 2019 +0200
@@ -0,0 +1,79 @@
+/*
+ * 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.api.consumer.recordingstream;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import jdk.jfr.Event;
+import jdk.jfr.consumer.RecordingStream;
+
+/**
+ * @test
+ * @summary Tests that events are not emitted in handlers
+ * @key jfr
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.consumer.recordingstream.TestRecursive
+ */
+public class TestRecursive {
+
+ static class NotRecorded extends Event {
+ }
+
+ static class Recorded extends Event {
+ }
+
+ public static void main(String... args) throws Exception {
+ CountDownLatch latchOne = new CountDownLatch(1);
+ CountDownLatch latchTwo = new CountDownLatch(2);
+ AtomicBoolean fail = new AtomicBoolean();
+ try (RecordingStream r = new RecordingStream()) {
+ r.onEvent(e -> {
+ System.out.println(e);
+ NotRecorded event = new NotRecorded();
+ event.commit();
+ if (e.getEventType().getName().equals(Recorded.class.getName())) {
+ latchOne.countDown();
+ latchTwo.countDown();
+ }
+ if (e.getEventType().getName().equals(NotRecorded.class.getName())) {
+ fail.set(true);
+ }
+ });
+ r.startAsync();
+ Recorded e1 = new Recorded();
+ e1.commit();
+ latchOne.await();
+ Recorded e2 = new Recorded();
+ e2.commit();
+ latchTwo.await();
+ if (fail.get()) {
+ throw new Exception("Unexpected event found");
+ }
+ }
+ }
+}
--- a/test/jdk/jdk/jfr/api/consumer/recordingstream/TestStart.java Tue Oct 01 18:47:30 2019 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/recordingstream/TestStart.java Wed Oct 02 19:26:33 2019 +0200
@@ -44,14 +44,15 @@
static class StartEvent extends Event {
}
static class EventProducer extends Thread {
+ private final Object lock = new Object();
private boolean killed = false;
public void run() {
while (true) {
StartEvent s = new StartEvent();
s.commit();
- synchronized (this) {
+ synchronized (lock) {
try {
- wait(10);
+ lock.wait(10);
if (killed) {
return; // end thread
}
@@ -62,9 +63,9 @@
}
}
public void kill() {
- synchronized (this) {
+ synchronized (lock) {
this.killed = true;
- this.notifyAll();
+ lock.notifyAll();
}
}
}