jdk-sandbox: comparison test/jdk/java/net/Socket/Timeouts.java

equal deleted inserted replaced

-:c41783eb76eb
+:59567035d279
 * questions.
 */
 /*
 * @test
+* @bug 8221481
 * @library /test/lib
 * @build jdk.test.lib.Utils
-* @run testng Timeouts
+* @run testng/timeout=180 Timeouts
 * @summary Test Socket timeouts
 */
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 /**
 * Test timed connect where connection is established
 */
 public void testTimedConnect1() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 try (Socket s = new Socket()) {
 s.connect(ss.getLocalSocketAddress(), 2000);
 }
 }
 }
 /**
 * Test connect with a timeout of Integer.MAX_VALUE
 */
 public void testTimedConnect3() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 try (Socket s = new Socket()) {
 s.connect(ss.getLocalSocketAddress(), Integer.MAX_VALUE);
 }
 }
 }
 /**
 * Test connect with a negative timeout.
 */
 public void testTimedConnect4() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 try (Socket s = new Socket()) {
-try {
+expectThrows(IllegalArgumentException.class,
-s.connect(ss.getLocalSocketAddress(), -1);
+() -> s.connect(ss.getLocalSocketAddress(), -1));
-assertTrue(false);
-} catch (IllegalArgumentException expected) { }
 }
 }
 }
 /**
 * Test timed read where the read times out
 */
 public void testTimedRead3() throws IOException {
 withConnection((s1, s2) -> {
 s2.setSoTimeout(2000);
-try {
+long startMillis = millisTime();
-s2.getInputStream().read();
+expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
-assertTrue(false);
+int timeout = s2.getSoTimeout();
-} catch (SocketTimeoutException expected) { }
+checkDuration(startMillis, timeout-100, timeout+2000);
 });
 }
 /**
 * Test timed read that succeeds after a previous read has timed out
 */
 public void testTimedRead4() throws IOException {
 withConnection((s1, s2) -> {
 s2.setSoTimeout(2000);
-try {
+expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
-s2.getInputStream().read();
-assertTrue(false);
-} catch (SocketTimeoutException e) { }
 s1.getOutputStream().write(99);
 int b = s2.getInputStream().read();
 assertTrue(b == 99);
 });
 }
 * after a short delay
 */
 public void testTimedRead5() throws IOException {
 withConnection((s1, s2) -> {
 s2.setSoTimeout(2000);
-try {
+expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
-s2.getInputStream().read();
-assertTrue(false);
-} catch (SocketTimeoutException e) { }
 s2.setSoTimeout(30*3000);
 scheduleWrite(s1.getOutputStream(), 99, 2000);
 int b = s2.getInputStream().read();
 assertTrue(b == 99);
 });
 * Test untimed read that succeeds after a previous read has timed out
 */
 public void testTimedRead6() throws IOException {
 withConnection((s1, s2) -> {
 s2.setSoTimeout(2000);
-try {
+expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
-s2.getInputStream().read();
-assertTrue(false);
-} catch (SocketTimeoutException e) { }
 s1.getOutputStream().write(99);
 s2.setSoTimeout(0);
 int b = s2.getInputStream().read();
 assertTrue(b == 99);
 });
 * after a short delay
 */
 public void testTimedRead7() throws IOException {
 withConnection((s1, s2) -> {
 s2.setSoTimeout(2000);
-try {
+expectThrows(SocketTimeoutException.class, () -> s2.getInputStream().read());
-s2.getInputStream().read();
-assertTrue(false);
-} catch (SocketTimeoutException e) { }
 scheduleWrite(s1.getOutputStream(), 99, 2000);
 s2.setSoTimeout(0);
 int b = s2.getInputStream().read();
 assertTrue(b == 99);
 });
 */
 public void testTimedRead8() throws IOException {
 withConnection((s1, s2) -> {
 s2.setSoTimeout(30*1000);
 scheduleClose(s2, 2000);
-try {
+expectThrows(SocketException.class, () -> s2.getInputStream().read());
-s2.getInputStream().read();
-assertTrue(false);
-} catch (SocketException expected) { }
 });
 }
 /**
 * Test read with a timeout of Integer.MAX_VALUE
 * Test timed accept where a connection is established immediately
 */
 public void testTimedAccept1() throws IOException {
 Socket s1 = null;
 Socket s2 = null;
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 s1 = new Socket();
 s1.connect(ss.getLocalSocketAddress());
 ss.setSoTimeout(30*1000);
 s2 = ss.accept();
 } finally {
 /**
 * Test timed accept where a connection is established after a short delay
 */
 public void testTimedAccept2() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 ss.setSoTimeout(30*1000);
 scheduleConnect(ss.getLocalSocketAddress(), 2000);
 Socket s = ss.accept();
 s.close();
 }
 /**
 * Test timed accept where the accept times out
 */
 public void testTimedAccept3() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 ss.setSoTimeout(2000);
+long startMillis = millisTime();
 try {
 Socket s = ss.accept();
 s.close();
-assertTrue(false);
+fail();
-} catch (SocketTimeoutException expected) { }
+} catch (SocketTimeoutException expected) {
+int timeout = ss.getSoTimeout();
+checkDuration(startMillis, timeout-100, timeout+2000);
+}
 }
 }
 /**
 * Test timed accept where a connection is established immediately after a
 * previous accept timed out.
 */
 public void testTimedAccept4() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 ss.setSoTimeout(2000);
 try {
 Socket s = ss.accept();
 s.close();
-assertTrue(false);
+fail();
 } catch (SocketTimeoutException expected) { }
 try (Socket s1 = new Socket()) {
 s1.connect(ss.getLocalSocketAddress());
 Socket s2 = ss.accept();
 s2.close();
 /**
 * Test untimed accept where a connection is established after a previous
 * accept timed out
 */
 public void testTimedAccept5() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 ss.setSoTimeout(2000);
 try {
 Socket s = ss.accept();
 s.close();
-assertTrue(false);
+fail();
 } catch (SocketTimeoutException expected) { }
 ss.setSoTimeout(0);
 try (Socket s1 = new Socket()) {
 s1.connect(ss.getLocalSocketAddress());
 Socket s2 = ss.accept();
 /**
 * Test untimed accept where a connection is established after a previous
 * accept timed out and after a short delay
 */
 public void testTimedAccept6() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 ss.setSoTimeout(2000);
 try {
 Socket s = ss.accept();
 s.close();
-assertTrue(false);
+fail();
 } catch (SocketTimeoutException expected) { }
 ss.setSoTimeout(0);
 scheduleConnect(ss.getLocalSocketAddress(), 2000);
 Socket s = ss.accept();
 s.close();
 /**
 * Test async close of a timed accept
 */
 public void testTimedAccept7() throws IOException {
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 ss.setSoTimeout(30*1000);
-scheduleClose(ss, 2000);
+long delay = 2000;
+scheduleClose(ss, delay);
+long startMillis = millisTime();
 try {
 ss.accept().close();
-assertTrue(false);
+fail();
-} catch (SocketException expected) { }
+} catch (SocketException expected) {
+checkDuration(startMillis, delay-100, delay+2000);
+}
+}
+}
+/**
+* Test timed accept with the thread interrupt status set.
+*/
+public void testTimedAccept8() throws IOException {
+try (ServerSocket ss = boundServerSocket()) {
+ss.setSoTimeout(2000);
+Thread.currentThread().interrupt();
+long startMillis = millisTime();
+try {
+Socket s = ss.accept();
+s.close();
+fail();
+} catch (SocketTimeoutException expected) {
+// accept should have blocked for 2 seconds
+int timeout = ss.getSoTimeout();
+checkDuration(startMillis, timeout-100, timeout+2000);
+assertTrue(Thread.currentThread().isInterrupted());
+} finally {
+Thread.interrupted(); // clear interrupt status
+}
+}
+}
+/**
+* Test interrupt of thread blocked in timed accept.
+*/
+public void testTimedAccept9() throws IOException {
+try (ServerSocket ss = boundServerSocket()) {
+ss.setSoTimeout(4000);
+// interrupt thread after 1 second
+Future<?> interrupter = scheduleInterrupt(Thread.currentThread(), 1000);
+long startMillis = millisTime();
+try {
+Socket s = ss.accept();   // should block for 4 seconds
+s.close();
+fail();
+} catch (SocketTimeoutException expected) {
+// accept should have blocked for 4 seconds
+int timeout = ss.getSoTimeout();
+checkDuration(startMillis, timeout-100, timeout+2000);
+assertTrue(Thread.currentThread().isInterrupted());
+} finally {
+interrupter.cancel(true);
+Thread.interrupted(); // clear interrupt status
+}
+}
+}
+/**
+* Test two threads blocked in timed accept where no connection is established.
+*/
+public void testTimedAccept10() throws Exception {
+ExecutorService pool = Executors.newFixedThreadPool(2);
+try (ServerSocket ss = boundServerSocket()) {
+ss.setSoTimeout(4000);
+long startMillis = millisTime();
+Future<Socket> result1 = pool.submit(ss::accept);
+Future<Socket> result2 = pool.submit(ss::accept);
+// both tasks should complete with SocketTimeoutException
+Throwable e = expectThrows(ExecutionException.class, result1::get);
+assertTrue(e.getCause() instanceof SocketTimeoutException);
+e = expectThrows(ExecutionException.class, result2::get);
+assertTrue(e.getCause() instanceof SocketTimeoutException);
+// should get here in 4 seconds, not 8 seconds
+int timeout = ss.getSoTimeout();
+checkDuration(startMillis, timeout-100, timeout+2000);
+} finally {
+pool.shutdown();
+}
+}
+/**
+* Test two threads blocked in timed accept where one connection is established.
+*/
+public void testTimedAccept11() throws Exception {
+ExecutorService pool = Executors.newFixedThreadPool(2);
+try (ServerSocket ss = boundServerSocket()) {
+ss.setSoTimeout(4000);
+long startMillis = millisTime();
+Future<Socket> result1 = pool.submit(ss::accept);
+Future<Socket> result2 = pool.submit(ss::accept);
+// establish connection after 2 seconds
+scheduleConnect(ss.getLocalSocketAddress(), 2000);
+// one task should have accepted the connection, the other should
+// have completed with SocketTimeoutException
+Socket s1 = null;
+try {
+s1 = result1.get();
+s1.close();
+} catch (ExecutionException e) {
+assertTrue(e.getCause() instanceof SocketTimeoutException);
+}
+Socket s2 = null;
+try {
+s2 = result2.get();
+s2.close();
+} catch (ExecutionException e) {
+assertTrue(e.getCause() instanceof SocketTimeoutException);
+}
+assertTrue((s1 != null) ^ (s2 != null));
+// should get here in 4 seconds, not 8 seconds
+int timeout = ss.getSoTimeout();
+checkDuration(startMillis, timeout-100, timeout+2000);
+} finally {
+pool.shutdown();
 }
 }
 /**
 * Test Socket setSoTimeout with a negative timeout.
 try (ServerSocket ss = new ServerSocket()) {
 ss.setSoTimeout(-1);
 }
 }
+/**
+* Returns a ServerSocket bound to a port on the loopback address
+*/
+static ServerSocket boundServerSocket() throws IOException {
+var loopback = InetAddress.getLoopbackAddress();
+ServerSocket ss = new ServerSocket();
+ss.bind(new InetSocketAddress(loopback, 0));
+return ss;
+}
+/**
+* An operation that accepts two arguments and may throw IOException
+*/
 interface ThrowingBiConsumer<T, U> {
 void accept(T t, U u) throws IOException;
 }
 /**
 static void withConnection(ThrowingBiConsumer<Socket, Socket> consumer)
 throws IOException
 {
 Socket s1 = null;
 Socket s2 = null;
-try (ServerSocket ss = new ServerSocket(0)) {
+try (ServerSocket ss = boundServerSocket()) {
 s1 = new Socket();
 s1.connect(ss.getLocalSocketAddress());
 s2 = ss.accept();
 consumer.accept(s1, s2);
 } finally {
 } catch (IOException ioe) { }
 }, delay);
 }
 /**
+* Schedule thread to be interrupted after a delay
+*/
+static Future<?> scheduleInterrupt(Thread thread, long delay) {
+return schedule(() -> thread.interrupt(), delay);
+}
+/**
 * Schedule a thread to connect to the given end point after a delay
 */
 static void scheduleConnect(SocketAddress remote, long delay) {
 schedule(() -> {
 try (Socket s = new Socket()) {
 }
 static void scheduleWrite(OutputStream out, int b, long delay) {
 scheduleWrite(out, new byte[] { (byte)b }, delay);
 }
-static void schedule(Runnable task, long delay) {
+static Future<?> schedule(Runnable task, long delay) {
 ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
 try {
-executor.schedule(task, delay, TimeUnit.MILLISECONDS);
+return executor.schedule(task, delay, TimeUnit.MILLISECONDS);
 } finally {
 executor.shutdown();
 }
 }
+/**
+* Returns the current time in milliseconds.
+*/
+private static long millisTime() {
+long now = System.nanoTime();
+return TimeUnit.MILLISECONDS.convert(now, TimeUnit.NANOSECONDS);
+}
+/**
+* Check the duration of a task
+* @param start start time, in milliseconds
+* @param min minimum expected duration, in milliseconds
+* @param max maximum expected duration, in milliseconds
+* @return the duration (now - start), in milliseconds
+*/
+private static long checkDuration(long start, long min, long max) {
+long duration = millisTime() - start;
+assertTrue(duration >= min,
+"Duration " + duration + "ms, expected >= " + min + "ms");
+assertTrue(duration <= max,
+"Duration " + duration + "ms, expected <= " + max + "ms");
+return duration;
+}
 }

changeset 55102	59567035d279
parent 54289	6183f835b9b6
child 58679	9c3209ff7550