stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8233870: JFR TestSetEndTime.java times out - onClose() is never called

Browse Source 
Reviewed-by: mgronlun
This commit is contained in:
Erik Gahlin 2019-11-26 17:00:57 +01:00
parent 71ec3b6947
commit ddb7954946
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
View File

@ -292,4 +292,8 @@ public final class ChunkHeader {
static long headerSize() { static long headerSize() {
return HEADER_SIZE; return HEADER_SIZE;
} }
public long getLastNanos() {
return getStartNanos() + getDurationNanos();
}
} }

7
src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
View File

@ -202,7 +202,7 @@ public final class ChunkParser {
long lastValid = absoluteChunkEnd; long lastValid = absoluteChunkEnd;
long metadataPoistion = chunkHeader.getMetataPosition(); long metadataPoistion = chunkHeader.getMetataPosition();
long contantPosition = chunkHeader.getConstantPoolPosition(); long contantPosition = chunkHeader.getConstantPoolPosition();
chunkFinished = awaitUpdatedHeader(absoluteChunkEnd); chunkFinished = awaitUpdatedHeader(absoluteChunkEnd, configuration.filterEnd);
if (chunkFinished) { if (chunkFinished) {
Logger.log(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO, "At chunk end"); Logger.log(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO, "At chunk end");
return null; return null;
@ -279,11 +279,14 @@ public final class ChunkParser {
} }
} }
private boolean awaitUpdatedHeader(long absoluteChunkEnd) throws IOException { private boolean awaitUpdatedHeader(long absoluteChunkEnd, long filterEnd) throws IOException {
if (Logger.shouldLog(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO)) { if (Logger.shouldLog(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO)) {
Logger.log(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO, "Waiting for more data (streaming). Read so far: " + chunkHeader.getChunkSize() + " bytes"); Logger.log(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO, "Waiting for more data (streaming). Read so far: " + chunkHeader.getChunkSize() + " bytes");
} }
while (true) { while (true) {
if (chunkHeader.getLastNanos() > filterEnd) {
return true;
}
chunkHeader.refresh(); chunkHeader.refresh();
if (absoluteChunkEnd != chunkHeader.getEnd()) { if (absoluteChunkEnd != chunkHeader.getEnd()) {
return false; return false;

12
test/jdk/jdk/jfr/api/consumer/recordingstream/TestSetEndTime.java
View File

@ -63,6 +63,14 @@ public final class TestSetEndTime {
public static void main(String... args) throws Exception { public static void main(String... args) throws Exception {
testEventStream(); testEventStream();
testRecordingStream(); testRecordingStream();
testEmptyStream();
}
private static void testEmptyStream() {
try (RecordingStream rs = new RecordingStream()) {
rs.setEndTime(Instant.now().plusMillis(1100));
rs.start();
}
} }
private static void testRecordingStream() throws Exception { private static void testRecordingStream() throws Exception {
@ -89,10 +97,10 @@ public final class TestSetEndTime {
} }
closed.await(); closed.await();
System.out.println("Found events: " + count.get()); System.out.println("Found events: " + count.get());
if (count.get() < 50) { if (count.get() > 0 && count.get() < 50) {
return; return;
} }
System.out.println("Found 50 events. Retrying"); System.out.println("Retrying");
System.out.println(); System.out.println();
} }
} }