stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8343877: Test AsyncClose.java intermittent fails - Socket.getInputStream().read() wasn't preempted

Browse Source 
Reviewed-by: dfuchs, msheppar, syan, alanb
This commit is contained in:
Jaikiran Pai 2024-11-14 14:46:19 +00:00
parent 4d1a51cb85
commit 752e162955
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/jdk/java/net/Socket/asyncClose/Socket_getInputStream_read.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -60,7 +60,7 @@ public class Socket_getInputStream_read extends AsyncCloseTest implements Runnab
}
latch.countDown();
int n = in.read();
failed("Socket.getInputStream().read() returned unexpectedly!!");
failed("Socket.getInputStream().read() returned unexpectedly, n=" + n);
} catch (SocketException se) {
if (latch.getCount() != 1) {
closed();
@ -77,20 +77,22 @@ public class Socket_getInputStream_read extends AsyncCloseTest implements Runnab
public AsyncCloseTest go() {
try {
InetAddress lh = InetAddress.getLocalHost();
ServerSocket ss = new ServerSocket(0, 0, lh);
s.connect( new InetSocketAddress(lh, ss.getLocalPort()) );
Socket s2 = ss.accept();
Thread thr = new Thread(this);
thr.start();
latch.await();
Thread.sleep(5000); //sleep, so Socket.getInputStream().read() can block
s.close();
thr.join();
try (ServerSocket ss = new ServerSocket(0, 0, lh)) {
s.connect(new InetSocketAddress(lh, ss.getLocalPort()));
try (Socket s2 = ss.accept()) {
Thread thr = new Thread(this);
thr.start();
latch.await();
Thread.sleep(5000); //sleep, so Socket.getInputStream().read() can block
s.close();
thr.join();
}
if (isClosed()) {
return passed();
} else {
return failed("Socket.getInputStream().read() wasn't preempted");
if (isClosed()) {
return passed();
} else {
return failed("Socket.getInputStream().read() wasn't preempted");
}
}
} catch (Exception x) {
failed(x.getMessage());

30
test/jdk/java/net/Socket/asyncClose/Socket_getOutputStream_write.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -66,20 +66,22 @@ public class Socket_getOutputStream_write extends AsyncCloseTest implements Runn
public AsyncCloseTest go() {
try {
InetAddress lh = InetAddress.getLocalHost();
ServerSocket ss = new ServerSocket(0, 0, lh);
s.connect( new InetSocketAddress(lh, ss.getLocalPort()) );
Socket s2 = ss.accept();
Thread thr = new Thread(this);
thr.start();
latch.await();
Thread.sleep(1000);
s.close();
thr.join();
try (ServerSocket ss = new ServerSocket(0, 0, lh)) {
s.connect(new InetSocketAddress(lh, ss.getLocalPort()));
try (Socket s2 = ss.accept()) {
Thread thr = new Thread(this);
thr.start();
latch.await();
Thread.sleep(1000);
s.close();
thr.join();
}
if (isClosed()) {
return passed();
} else {
return failed("Socket.getOutputStream().write() wasn't preempted");
if (isClosed()) {
return passed();
} else {
return failed("Socket.getOutputStream().write() wasn't preempted");
}
}
} catch (Exception x) {
failed(x.getMessage());