8358689: test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java does not build after JDK-8351594

Reviewed-by: alanb
This commit is contained in:
Erik Gahlin 2025-06-05 13:08:48 +00:00
parent 782bbca439
commit 33ed7c1842

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -65,7 +65,7 @@ public class SocketEventOverhead {
@Fork(value = 1, jvmArgs = { @Fork(value = 1, jvmArgs = {
"--add-exports", "--add-exports",
"java.base/jdk.internal.event=ALL-UNNAMED", "java.base/jdk.internal.event=ALL-UNNAMED",
"-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s"}) "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s,jdk.SocketWrite#throttle=off"})
@Benchmark @Benchmark
public int socketWriteJFREnabledEventNotEmitted(SkeletonFixture fixture) { public int socketWriteJFREnabledEventNotEmitted(SkeletonFixture fixture) {
return fixture.write(); return fixture.write();
@ -73,7 +73,7 @@ public class SocketEventOverhead {
@Fork(value = 1, jvmArgs = { @Fork(value = 1, jvmArgs = {
"--add-exports","java.base/jdk.internal.event=ALL-UNNAMED", "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
"-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false"}) "-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false,jdk.SocketWrite#throttle=off"})
@Benchmark @Benchmark
public int socketWriteJFREnabledEventEmitted(SkeletonFixture fixture) { public int socketWriteJFREnabledEventEmitted(SkeletonFixture fixture) {
return fixture.write(); return fixture.write();
@ -99,7 +99,7 @@ public class SocketEventOverhead {
@Fork(value = 1, jvmArgs = { @Fork(value = 1, jvmArgs = {
"--add-exports", "--add-exports",
"java.base/jdk.internal.event=ALL-UNNAMED", "java.base/jdk.internal.event=ALL-UNNAMED",
"-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s"}) "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s,jdk.SocketRead#throttle=off"})
@Benchmark @Benchmark
public int socketReadJFREnabledEventNotEmitted(SkeletonFixture fixture) { public int socketReadJFREnabledEventNotEmitted(SkeletonFixture fixture) {
return fixture.read(); return fixture.read();
@ -107,7 +107,7 @@ public class SocketEventOverhead {
@Fork(value = 1, jvmArgs = { @Fork(value = 1, jvmArgs = {
"--add-exports","java.base/jdk.internal.event=ALL-UNNAMED", "--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
"-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false"}) "-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false,jdk.SocketRead#throttle=off"})
@Benchmark @Benchmark
public int socketReadJFREnabledEventEmitted(SkeletonFixture fixture) { public int socketReadJFREnabledEventEmitted(SkeletonFixture fixture) {
return fixture.read(); return fixture.read();
@ -137,10 +137,7 @@ public class SocketEventOverhead {
try { try {
nbytes = write0(); nbytes = write0();
} finally { } finally {
long duration = start - SocketWriteEvent.timestamp(); SocketWriteEvent.offer(start, nbytes, getRemoteAddress());
if (SocketWriteEvent.shouldCommit(duration)) {
SocketWriteEvent.emit(start, duration, nbytes, getRemoteAddress());
}
} }
return nbytes; return nbytes;
} }
@ -158,10 +155,7 @@ public class SocketEventOverhead {
try { try {
nbytes = read0(); nbytes = read0();
} finally { } finally {
long duration = start - SocketReadEvent.timestamp(); SocketReadEvent.offer(start, nbytes, getRemoteAddress(), 0);
if (SocketReadEvent.shouldCommit(duration)) {
SocketReadEvent.emit(start, duration, nbytes, getRemoteAddress(), 0);
}
} }
return nbytes; return nbytes;
} }