mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-06 06:00:26 +00:00
8296797: java/nio/channels/vthread/BlockingChannelOps.testSocketChannelWriteAsyncClose failed with ClosedChannelException
Reviewed-by: chegar, jpai
This commit is contained in:
Alan Bateman
parent
a2cdcdd65d
commit
8eb90e2d9c
@ -66,7 +66,6 @@ import java.nio.channels.ServerSocketChannel;
|
||||
import java.nio.channels.SocketChannel;
|
||||
import java.nio.channels.WritableByteChannel;
|
||||
|
||||
import jdk.test.lib.Platform;
|
||||
import jdk.test.lib.thread.VThreadRunner;
|
||||
import org.testng.annotations.Test;
|
||||
import static org.testng.Assert.*;
|
||||
@ -107,7 +106,7 @@ public class BlockingChannelOps {
|
||||
SocketChannel sc1 = connection.channel1();
|
||||
SocketChannel sc2 = connection.channel2();
|
||||
|
||||
// delayed write to sc1
|
||||
// write to sc1 when current thread blocks in sc2.read
|
||||
ByteBuffer bb1 = ByteBuffer.wrap("XXX".getBytes("UTF-8"));
|
||||
runAfterParkedAsync(() -> sc1.write(bb1));
|
||||
|
||||
@ -130,7 +129,7 @@ public class BlockingChannelOps {
|
||||
SocketChannel sc1 = connection.channel1();
|
||||
SocketChannel sc2 = connection.channel2();
|
||||
|
||||
// delayed read from sc2 to EOF
|
||||
// read from sc2 to EOF when current thread blocks in sc1.write
|
||||
Thread reader = runAfterParkedAsync(() -> readToEOF(sc2));
|
||||
|
||||
// write to sc1 should block
|
||||
@ -174,7 +173,7 @@ public class BlockingChannelOps {
|
||||
try (var connection = new Connection()) {
|
||||
SocketChannel sc = connection.channel1();
|
||||
|
||||
// delayed interrupt of current thread
|
||||
// interrupt current thread when it blocks in read
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
@ -194,21 +193,26 @@ public class BlockingChannelOps {
|
||||
@Test
|
||||
public void testSocketChannelWriteAsyncClose() throws Exception {
|
||||
VThreadRunner.run(() -> {
|
||||
try (var connection = new Connection()) {
|
||||
SocketChannel sc = connection.channel1();
|
||||
runAfterParkedAsync(sc::close);
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sc.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
boolean retry = true;
|
||||
while (retry) {
|
||||
try (var connection = new Connection()) {
|
||||
SocketChannel sc = connection.channel1();
|
||||
|
||||
// close sc when current thread blocks in write
|
||||
runAfterParkedAsync(sc::close);
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sc.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
}
|
||||
} catch (AsynchronousCloseException expected) {
|
||||
// closed when blocked in write
|
||||
retry = false;
|
||||
} catch (ClosedChannelException e) {
|
||||
// closed when not blocked in write, need to retry test
|
||||
}
|
||||
} catch (AsynchronousCloseException e) {
|
||||
// expected
|
||||
} catch (ClosedChannelException e) {
|
||||
// on macOS the write loop may block more than once
|
||||
if (!Platform.isOSX()) throw e;
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -220,25 +224,29 @@ public class BlockingChannelOps {
|
||||
@Test
|
||||
public void testSocketChannelWriteInterrupt() throws Exception {
|
||||
VThreadRunner.run(() -> {
|
||||
try (var connection = new Connection()) {
|
||||
SocketChannel sc = connection.channel1();
|
||||
boolean retry = true;
|
||||
while (retry) {
|
||||
try (var connection = new Connection()) {
|
||||
SocketChannel sc = connection.channel1();
|
||||
|
||||
// delayed interrupt of current thread
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
// interrupt current thread when it blocks in write
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sc.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sc.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
}
|
||||
} catch (ClosedByInterruptException e) {
|
||||
// closed when blocked in write
|
||||
assertTrue(Thread.interrupted());
|
||||
retry = false;
|
||||
} catch (ClosedChannelException e) {
|
||||
// closed when not blocked in write, need to retry test
|
||||
}
|
||||
} catch (ClosedByInterruptException e) {
|
||||
assertTrue(Thread.interrupted());
|
||||
} catch (ClosedChannelException e) {
|
||||
// on macOS the write loop may block more than once
|
||||
if (!Platform.isOSX()) throw e;
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -266,7 +274,7 @@ public class BlockingChannelOps {
|
||||
SocketChannel sc1 = connection.channel1();
|
||||
SocketChannel sc2 = connection.channel2();
|
||||
|
||||
// delayed write to sc1
|
||||
// write to sc1 when currnet thread blocks reading from sc2
|
||||
ByteBuffer bb = ByteBuffer.wrap("XXX".getBytes("UTF-8"));
|
||||
runAfterParkedAsync(() -> sc1.write(bb));
|
||||
|
||||
@ -308,7 +316,7 @@ public class BlockingChannelOps {
|
||||
ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
||||
var sc1 = SocketChannel.open();
|
||||
|
||||
// delayed connect
|
||||
// connect when current thread when it blocks in accept
|
||||
runAfterParkedAsync(() -> sc1.connect(ssc.getLocalAddress()));
|
||||
|
||||
// accept should block
|
||||
@ -348,7 +356,7 @@ public class BlockingChannelOps {
|
||||
InetAddress lh = InetAddress.getLoopbackAddress();
|
||||
ssc.bind(new InetSocketAddress(lh, 0));
|
||||
|
||||
// delayed interrupt of current thread
|
||||
// interrupt current thread when it blocks in accept
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
@ -385,7 +393,7 @@ public class BlockingChannelOps {
|
||||
ssc.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0));
|
||||
var sc = SocketChannel.open();
|
||||
|
||||
// delayed connect
|
||||
// interrupt current thread when it blocks in accept
|
||||
runAfterParkedAsync(() -> sc.connect(ssc.getLocalAddress()));
|
||||
|
||||
// accept should block
|
||||
@ -435,7 +443,7 @@ public class BlockingChannelOps {
|
||||
InetAddress lh = InetAddress.getLoopbackAddress();
|
||||
dc2.bind(new InetSocketAddress(lh, 0));
|
||||
|
||||
// delayed send from sc1
|
||||
// send from dc1 when current thread blocked in dc2.receive
|
||||
ByteBuffer bb1 = ByteBuffer.wrap("XXX".getBytes("UTF-8"));
|
||||
runAfterParkedAsync(() -> dc1.send(bb1, dc2.getLocalAddress()));
|
||||
|
||||
@ -475,7 +483,7 @@ public class BlockingChannelOps {
|
||||
InetAddress lh = InetAddress.getLoopbackAddress();
|
||||
dc.bind(new InetSocketAddress(lh, 0));
|
||||
|
||||
// delayed interrupt of current thread
|
||||
// interrupt current thread when it blocks in receive
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
@ -513,7 +521,7 @@ public class BlockingChannelOps {
|
||||
InetAddress lh = InetAddress.getLoopbackAddress();
|
||||
dc2.bind(new InetSocketAddress(lh, 0));
|
||||
|
||||
// delayed send from dc2
|
||||
// send from dc1 when current thread blocks in dc2 receive
|
||||
ByteBuffer bb = ByteBuffer.wrap("XXX".getBytes("UTF-8"));
|
||||
runAfterParkedAsync(() -> dc1.send(bb, dc2.getLocalAddress()));
|
||||
|
||||
@ -556,7 +564,7 @@ public class BlockingChannelOps {
|
||||
if (timeout > 0)
|
||||
dc.socket().setSoTimeout(timeout);
|
||||
|
||||
// delayed close of channel/socket
|
||||
// close channel/socket when current thread blocks in receive
|
||||
runAfterParkedAsync(dc::close);
|
||||
|
||||
assertThrows(SocketException.class, () -> dc.socket().receive(p));
|
||||
@ -592,7 +600,7 @@ public class BlockingChannelOps {
|
||||
if (timeout > 0)
|
||||
dc.socket().setSoTimeout(timeout);
|
||||
|
||||
// delayed interrupt of current thread
|
||||
// interrupt current thread when it blocks in receive
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
@ -640,7 +648,7 @@ public class BlockingChannelOps {
|
||||
try (Pipe.SinkChannel sink = p.sink();
|
||||
Pipe.SourceChannel source = p.source()) {
|
||||
|
||||
// delayed write from sink
|
||||
// write from sink when current thread blocks reading from source
|
||||
ByteBuffer bb1 = ByteBuffer.wrap("XXX".getBytes("UTF-8"));
|
||||
runAfterParkedAsync(() -> sink.write(bb1));
|
||||
|
||||
@ -663,7 +671,7 @@ public class BlockingChannelOps {
|
||||
try (Pipe.SinkChannel sink = p.sink();
|
||||
Pipe.SourceChannel source = p.source()) {
|
||||
|
||||
// delayed read from source to EOF
|
||||
// read from source to EOF when current thread blocking in write
|
||||
Thread reader = runAfterParkedAsync(() -> readToEOF(source));
|
||||
|
||||
// write to sink should block
|
||||
@ -688,7 +696,8 @@ public class BlockingChannelOps {
|
||||
public void testPipeReadAsyncClose() throws Exception {
|
||||
VThreadRunner.run(() -> {
|
||||
Pipe p = Pipe.open();
|
||||
try (Pipe.SourceChannel source = p.source()) {
|
||||
try (Pipe.SinkChannel sink = p.sink();
|
||||
Pipe.SourceChannel source = p.source()) {
|
||||
runAfterParkedAsync(source::close);
|
||||
try {
|
||||
int n = source.read(ByteBuffer.allocate(100));
|
||||
@ -705,9 +714,10 @@ public class BlockingChannelOps {
|
||||
public void testPipeReadInterrupt() throws Exception {
|
||||
VThreadRunner.run(() -> {
|
||||
Pipe p = Pipe.open();
|
||||
try (Pipe.SourceChannel source = p.source()) {
|
||||
try (Pipe.SinkChannel sink = p.sink();
|
||||
Pipe.SourceChannel source = p.source()) {
|
||||
|
||||
// delayed interrupt of current thread
|
||||
// interrupt current thread when it blocks reading from source
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
@ -727,17 +737,28 @@ public class BlockingChannelOps {
|
||||
@Test
|
||||
public void testPipeWriteAsyncClose() throws Exception {
|
||||
VThreadRunner.run(() -> {
|
||||
Pipe p = Pipe.open();
|
||||
try (Pipe.SinkChannel sink = p.sink()) {
|
||||
runAfterParkedAsync(sink::close);
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sink.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
boolean retry = true;
|
||||
while (retry) {
|
||||
Pipe p = Pipe.open();
|
||||
try (Pipe.SinkChannel sink = p.sink();
|
||||
Pipe.SourceChannel source = p.source()) {
|
||||
|
||||
// close sink when current thread blocks in write
|
||||
runAfterParkedAsync(sink::close);
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sink.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
}
|
||||
} catch (AsynchronousCloseException e) {
|
||||
// closed when blocked in write
|
||||
retry = false;
|
||||
} catch (ClosedChannelException e) {
|
||||
// closed when not blocked in write, need to retry test
|
||||
}
|
||||
} catch (AsynchronousCloseException expected) { }
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -748,22 +769,30 @@ public class BlockingChannelOps {
|
||||
@Test
|
||||
public void testPipeWriteInterrupt() throws Exception {
|
||||
VThreadRunner.run(() -> {
|
||||
Pipe p = Pipe.open();
|
||||
try (Pipe.SinkChannel sink = p.sink()) {
|
||||
boolean retry = true;
|
||||
while (retry) {
|
||||
Pipe p = Pipe.open();
|
||||
try (Pipe.SinkChannel sink = p.sink();
|
||||
Pipe.SourceChannel source = p.source()) {
|
||||
|
||||
// delayed interrupt of current thread
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
// interrupt current thread when it blocks in write
|
||||
Thread thisThread = Thread.currentThread();
|
||||
runAfterParkedAsync(thisThread::interrupt);
|
||||
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sink.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
try {
|
||||
ByteBuffer bb = ByteBuffer.allocate(100*1024);
|
||||
for (;;) {
|
||||
int n = sink.write(bb);
|
||||
assertTrue(n > 0);
|
||||
bb.clear();
|
||||
}
|
||||
} catch (ClosedByInterruptException expected) {
|
||||
// closed when blocked in write
|
||||
assertTrue(Thread.interrupted());
|
||||
retry = false;
|
||||
} catch (ClosedChannelException e) {
|
||||
// closed when not blocked in write, need to retry test
|
||||
}
|
||||
} catch (ClosedByInterruptException expected) {
|
||||
assertTrue(Thread.interrupted());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user