infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8354024: [JMH] Create ephemeral UnixDomainSocketAddress provider with thread-safe close semantics

Browse Source 
Reviewed-by: michaelm
This commit is contained in:
Volkan Yazici 2025-05-13 11:08:16 +00:00 committed by Michael McMahon
parent 85db4631ae
commit 7dcc386af9
2 changed files with 25 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
View File

@ -27,9 +27,9 @@ import java.net.StandardProtocolFamily;
import java.net.UnixDomainSocketAddress;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.nio.file.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.runner.Runner;
@ -49,55 +49,31 @@ import org.openjdk.jmh.runner.options.OptionsBuilder;
public class SocketChannelConnectionSetup {
private ServerSocketChannel ssc;
private Path sscFilePath;
private SocketChannel s1, s2;
private static volatile String tempDir;
private static final AtomicInteger count = new AtomicInteger(0);
private volatile Path socket;
@Param({"inet", "unix"})
private volatile String family;
static {
try {
Path p = Files.createTempDirectory("readWriteTest");
tempDir = p.toString();
} catch (IOException e) {
tempDir = null;
}
}
private ServerSocketChannel getServerSocketChannel() throws IOException {
if (family.equals("inet"))
return getInetServerSocketChannel();
else if (family.equals("unix"))
return getUnixServerSocketChannel();
throw new InternalError();
}
private ServerSocketChannel getInetServerSocketChannel() throws IOException {
return ServerSocketChannel.open().bind(null);
}
private ServerSocketChannel getUnixServerSocketChannel() throws IOException {
int next = count.incrementAndGet();
socket = Paths.get(tempDir, Integer.toString(next));
UnixDomainSocketAddress addr = UnixDomainSocketAddress.of(socket);
return ServerSocketChannel.open(StandardProtocolFamily.UNIX).bind(addr);
}
@Param({"INET", "UNIX"})
private String family;
@Setup(Level.Trial)
public void beforeRun() throws IOException {
ssc = getServerSocketChannel();
StandardProtocolFamily typedFamily = StandardProtocolFamily.valueOf(family);
ssc = ServerSocketChannel.open(typedFamily).bind(null);
// Record the UDS file path right after binding, as the socket may be
// closed later due to a failure, and subsequent calls to `getPath()`
// will throw.
sscFilePath = ssc.getLocalAddress() instanceof UnixDomainSocketAddress udsChannel
? udsChannel.getPath()
: null;
}
@TearDown(Level.Trial)
public void afterRun() throws IOException {
public void afterRun() throws Exception {
ssc.close();
if (family.equals("unix")) {
Files.deleteIfExists(socket);
Files.deleteIfExists(Path.of(tempDir));
if (sscFilePath != null) {
Files.delete(sscFilePath);
}
}

20
test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
View File

@ -47,23 +47,18 @@ import org.openjdk.jmh.annotations.*;
public class UnixSocketChannelReadWrite {
private ServerSocketChannel ssc;
private Path sscFilePath;
private SocketChannel s1, s2;
private ReadThread rt;
private ByteBuffer bb = ByteBuffer.allocate(1);
private volatile Path socket;
private ServerSocketChannel getServerSocketChannel() throws IOException {
socket = Files.createTempDirectory(UnixSocketChannelReadWrite.class.getSimpleName()).resolve("sock");
UnixDomainSocketAddress addr = UnixDomainSocketAddress.of(socket);
ServerSocketChannel c = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
c.bind(addr);
return c;
}
@Setup(Level.Trial)
public void beforeRun() throws IOException {
ssc = getServerSocketChannel();
ssc = ServerSocketChannel.open(StandardProtocolFamily.UNIX).bind(null);
// Record the UDS file path right after binding, as the socket may be
// closed later due to a failure, and subsequent calls to `getPath()`
// will throw.
sscFilePath = ((UnixDomainSocketAddress) ssc.getLocalAddress()).getPath();
s1 = SocketChannel.open(ssc.getLocalAddress());
s2 = ssc.accept();
@ -79,8 +74,7 @@ public class UnixSocketChannelReadWrite {
s1.close();
s2.close();
ssc.close();
Files.delete(socket);
Files.delete(socket.getParent());
Files.delete(sscFilePath);
rt.join();
}