Skip to content

Commit 33ed7c1

Browse files
committed
8358689: test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java does not build after JDK-8351594
Reviewed-by: alanb
1 parent 782bbca commit 33ed7c1

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

test/micro/org/openjdk/bench/java/net/SocketEventOverhead.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -65,15 +65,15 @@ public int socketWriteJFREnabledEventDisabled(SkeletonFixture fixture) {
6565
@Fork(value = 1, jvmArgs = {
6666
"--add-exports",
6767
"java.base/jdk.internal.event=ALL-UNNAMED",
68-
"-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s"})
68+
"-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=1s,jdk.SocketWrite#throttle=off"})
6969
@Benchmark
7070
public int socketWriteJFREnabledEventNotEmitted(SkeletonFixture fixture) {
7171
return fixture.write();
7272
}
7373

7474
@Fork(value = 1, jvmArgs = {
7575
"--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
76-
"-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false"})
76+
"-XX:StartFlightRecording:jdk.SocketWrite#enabled=true,jdk.SocketWrite#threshold=0ms,disk=false,jdk.SocketWrite#stackTrace=false,jdk.SocketWrite#throttle=off"})
7777
@Benchmark
7878
public int socketWriteJFREnabledEventEmitted(SkeletonFixture fixture) {
7979
return fixture.write();
@@ -99,15 +99,15 @@ public int socketReadJFREnabledEventDisabled(SkeletonFixture fixture) {
9999
@Fork(value = 1, jvmArgs = {
100100
"--add-exports",
101101
"java.base/jdk.internal.event=ALL-UNNAMED",
102-
"-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s"})
102+
"-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=1s,jdk.SocketRead#throttle=off"})
103103
@Benchmark
104104
public int socketReadJFREnabledEventNotEmitted(SkeletonFixture fixture) {
105105
return fixture.read();
106106
}
107107

108108
@Fork(value = 1, jvmArgs = {
109109
"--add-exports","java.base/jdk.internal.event=ALL-UNNAMED",
110-
"-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false"})
110+
"-XX:StartFlightRecording:jdk.SocketRead#enabled=true,jdk.SocketRead#threshold=0ms,disk=false,jdk.SocketRead#stackTrace=false,jdk.SocketRead#throttle=off"})
111111
@Benchmark
112112
public int socketReadJFREnabledEventEmitted(SkeletonFixture fixture) {
113113
return fixture.read();
@@ -137,10 +137,7 @@ public int write() {
137137
try {
138138
nbytes = write0();
139139
} finally {
140-
long duration = start - SocketWriteEvent.timestamp();
141-
if (SocketWriteEvent.shouldCommit(duration)) {
142-
SocketWriteEvent.emit(start, duration, nbytes, getRemoteAddress());
143-
}
140+
SocketWriteEvent.offer(start, nbytes, getRemoteAddress());
144141
}
145142
return nbytes;
146143
}
@@ -158,10 +155,7 @@ public int read() {
158155
try {
159156
nbytes = read0();
160157
} finally {
161-
long duration = start - SocketReadEvent.timestamp();
162-
if (SocketReadEvent.shouldCommit(duration)) {
163-
SocketReadEvent.emit(start, duration, nbytes, getRemoteAddress(), 0);
164-
}
158+
SocketReadEvent.offer(start, nbytes, getRemoteAddress(), 0);
165159
}
166160
return nbytes;
167161
}

0 commit comments

Comments
 (0)