forked from Tencent/TencentKona-8
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix(KonaFiber): Support available() and Connection Reset of InputStre…
…am of VTSocketImpl
--story=873966885
Contributed-by:emoryzheng
modified: jdk/src/share/classes/sun/nio/ch/VTSocketImpl.java
new file: jdk/test/java/net/Socket/ConnectionReset.java- Loading branch information
1 parent
989a2f8
commit db4a50f
Showing
2 changed files
with
248 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| /* | ||
| * Copyright (c) 2019, 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 | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| /** | ||
| * @test | ||
| * @requires os.family != "solaris" | ||
| * @run testng ConnectionReset | ||
| * @summary Test behavior of read and available when a connection is reset | ||
| */ | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.net.InetAddress; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.ServerSocket; | ||
| import java.net.Socket; | ||
|
|
||
| import org.testng.annotations.Test; | ||
| import static org.testng.Assert.*; | ||
|
|
||
| @Test | ||
| public class ConnectionReset { | ||
|
|
||
| static final int REPEAT_COUNT = 5; | ||
|
|
||
| /** | ||
| * Tests available before read when there are no bytes to read | ||
| */ | ||
| public void testAvailableBeforeRead1() throws IOException { | ||
| System.out.println("testAvailableBeforeRead1"); | ||
| withResetConnection(null, s -> { | ||
| InputStream in = s.getInputStream(); | ||
| for (int i=0; i<REPEAT_COUNT; i++) { | ||
| int bytesAvailable = in.available(); | ||
| System.out.format("available => %d%n", bytesAvailable); | ||
| assertTrue(bytesAvailable == 0); | ||
| try { | ||
| int bytesRead = in.read(); | ||
| if (bytesRead == -1) { | ||
| System.out.println("read => EOF"); | ||
| } else { | ||
| System.out.println("read => 1 byte"); | ||
| } | ||
| assertTrue(false); | ||
| } catch (IOException ioe) { | ||
| System.out.format("read => %s (expected)%n", ioe); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Tests available before read when there are bytes to read | ||
| */ | ||
| public void testAvailableBeforeRead2() throws IOException { | ||
| System.out.println("testAvailableBeforeRead2"); | ||
| byte[] data = { 1, 2, 3 }; | ||
| withResetConnection(data, s -> { | ||
| InputStream in = s.getInputStream(); | ||
| int remaining = data.length; | ||
| for (int i=0; i<REPEAT_COUNT; i++) { | ||
| int bytesAvailable = in.available(); | ||
| System.out.format("available => %d%n", bytesAvailable); | ||
| assertTrue(bytesAvailable <= remaining); | ||
| try { | ||
| int bytesRead = in.read(); | ||
| if (bytesRead == -1) { | ||
| System.out.println("read => EOF"); | ||
| assertTrue(false); | ||
| } else { | ||
| System.out.println("read => 1 byte"); | ||
| assertTrue(remaining > 0); | ||
| remaining--; | ||
| } | ||
| } catch (IOException ioe) { | ||
| System.out.format("read => %s%n", ioe); | ||
| remaining = 0; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Tests read before available when there are no bytes to read | ||
| */ | ||
| public void testReadBeforeAvailable1() throws IOException { | ||
| System.out.println("testReadBeforeAvailable1"); | ||
| withResetConnection(null, s -> { | ||
| InputStream in = s.getInputStream(); | ||
| for (int i=0; i<REPEAT_COUNT; i++) { | ||
| try { | ||
| int bytesRead = in.read(); | ||
| if (bytesRead == -1) { | ||
| System.out.println("read => EOF"); | ||
| } else { | ||
| System.out.println("read => 1 byte"); | ||
| } | ||
| assertTrue(false); | ||
| } catch (IOException ioe) { | ||
| System.out.format("read => %s (expected)%n", ioe); | ||
| } | ||
| int bytesAvailable = in.available(); | ||
| System.out.format("available => %d%n", bytesAvailable); | ||
| assertTrue(bytesAvailable == 0); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Tests read before available when there are bytes to read | ||
| */ | ||
| public void testReadBeforeAvailable2() throws IOException { | ||
| System.out.println("testReadBeforeAvailable2"); | ||
| byte[] data = { 1, 2, 3 }; | ||
| withResetConnection(data, s -> { | ||
| InputStream in = s.getInputStream(); | ||
| int remaining = data.length; | ||
| for (int i=0; i<REPEAT_COUNT; i++) { | ||
| try { | ||
| int bytesRead = in.read(); | ||
| if (bytesRead == -1) { | ||
| System.out.println("read => EOF"); | ||
| assertTrue(false); | ||
| } else { | ||
| System.out.println("read => 1 byte"); | ||
| assertTrue(remaining > 0); | ||
| remaining--; | ||
| } | ||
| } catch (IOException ioe) { | ||
| System.out.format("read => %s%n", ioe); | ||
| remaining = 0; | ||
| } | ||
| int bytesAvailable = in.available(); | ||
| System.out.format("available => %d%n", bytesAvailable); | ||
| assertTrue(bytesAvailable <= remaining); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Tests available and read on a socket closed after connection reset | ||
| */ | ||
| public void testAfterClose() throws IOException { | ||
| System.out.println("testAfterClose"); | ||
| withResetConnection(null, s -> { | ||
| InputStream in = s.getInputStream(); | ||
| try { | ||
| in.read(); | ||
| assertTrue(false); | ||
| } catch (IOException ioe) { | ||
| // expected | ||
| } | ||
| s.close(); | ||
| try { | ||
| int bytesAvailable = in.available(); | ||
| System.out.format("available => %d%n", bytesAvailable); | ||
| assertTrue(false); | ||
| } catch (IOException ioe) { | ||
| System.out.format("available => %s (expected)%n", ioe); | ||
| } | ||
| try { | ||
| int n = in.read(); | ||
| System.out.format("read => %d%n", n); | ||
| assertTrue(false); | ||
| } catch (IOException ioe) { | ||
| System.out.format("read => %s (expected)%n", ioe); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| interface ThrowingConsumer<T> { | ||
| void accept(T t) throws IOException; | ||
| } | ||
|
|
||
| /** | ||
| * Invokes a consumer with a Socket connected to a peer that has closed the | ||
| * connection with a "connection reset". The peer sends the given data bytes | ||
| * before closing (when data is not null). | ||
| */ | ||
| static void withResetConnection(byte[] data, ThrowingConsumer<Socket> consumer) | ||
| throws IOException | ||
| { | ||
| InetAddress loopback = InetAddress.getLoopbackAddress(); | ||
| try (ServerSocket listener = new ServerSocket()) { | ||
| listener.bind(new InetSocketAddress(loopback, 0)); | ||
| try (Socket socket = new Socket()) { | ||
| socket.connect(listener.getLocalSocketAddress()); | ||
| try (Socket peer = listener.accept()) { | ||
| if (data != null) { | ||
| peer.getOutputStream().write(data); | ||
| } | ||
| peer.setSoLinger(true, 0); | ||
| } | ||
| consumer.accept(socket); | ||
| } | ||
| } | ||
| } | ||
| } |