# HG changeset patch
# User alanb
# Date 1548424244 0
# Node ID e613cc3bc9d44bf2b28d227f71f4e2f3d1c527cb
# Parent  c775204f9dbee11baa6545772d82f6c17cf4391d
NioSocketImpl cleanup

diff -r c775204f9dbe -r e613cc3bc9d4 src/java.base/share/classes/sun/nio/ch/IOStatus.java
--- a/src/java.base/share/classes/sun/nio/ch/IOStatus.java	Fri Jan 25 11:33:52 2019 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/IOStatus.java	Fri Jan 25 13:50:44 2019 +0000
@@ -81,4 +81,12 @@
         return ((n > EOF) || (n < UNSUPPORTED_CASE));
     }
 
+    /**
+     * Returns true if the error code is UNAVAILABLE or INTERRUPTED, the
+     * error codes to indicate that an I/O operation can be retried.
+     */
+    static boolean okayToRetry(long n) {
+        return (n == IOStatus.UNAVAILABLE) || (n == IOStatus.INTERRUPTED);
+    }
+
 }
diff -r c775204f9dbe -r e613cc3bc9d4 src/java.base/share/classes/sun/nio/ch/Net.java
--- a/src/java.base/share/classes/sun/nio/ch/Net.java	Fri Jan 25 11:33:52 2019 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/Net.java	Fri Jan 25 13:50:44 2019 +0000
@@ -549,7 +549,7 @@
     public static native int pollConnect(FileDescriptor fd, long timeout)
         throws IOException;
 
-    static int polConnectlNow(FileDescriptor fd) throws IOException {
+    static int pollConnectNow(FileDescriptor fd) throws IOException {
         return pollConnect(fd, 0);
     }
 
diff -r c775204f9dbe -r e613cc3bc9d4 src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java	Fri Jan 25 11:33:52 2019 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java	Fri Jan 25 13:50:44 2019 +0000
@@ -76,9 +76,8 @@
  * that don't complete immediately will poll the socket.
  *
  * Behavior differences to examine:
- * - "Connection reset" handling differs to PlainSocketImpl for cases where
+ * "Connection reset" handling differs to PlainSocketImpl for cases where
  * an application continues to call read or available after a reset.
- * - SocketInputStream extends FileInputStream so can cast to FIS and access FD.
  */
 
 public class NioSocketImpl extends SocketImpl {
@@ -246,7 +245,7 @@
                 int timeout = this.timeout;
                 maybeConfigureNonBlocking(fd, timeout);
                 n = IOUtil.read(fd, dst, -1, nd);
-                if (statusImpliesRetry(n) && isOpen()) {
+                if (IOStatus.okayToRetry(n) && isOpen()) {
                     if (timeout > 0) {
                         // read with timeout
                         assert nonBlocking;
@@ -266,7 +265,7 @@
                         do {
                             park(Net.POLLIN);
                             n = IOUtil.read(fd, dst, -1, nd);
-                        } while (statusImpliesRetry(n) && isOpen());
+                        } while (IOStatus.okayToRetry(n) && isOpen());
                     }
                 }
                 return n;
@@ -317,7 +316,7 @@
             FileDescriptor fd = beginWrite();
             try {
                 n = IOUtil.write(fd, dst, -1, nd);
-                while (statusImpliesRetry(n) && isOpen()) {
+                while (IOStatus.okayToRetry(n) && isOpen()) {
                     park(Net.POLLOUT);
                     n = IOUtil.write(fd, dst, -1, nd);
                 }
@@ -439,11 +438,15 @@
     {
         synchronized (stateLock) {
             int state = this.state;
-            if (state >= ST_CLOSING)
-                throw new SocketException("Socket closed");
-            if (state == ST_CONNECTED)
-                throw new SocketException("Already connected");
-            assert state == ST_UNCONNECTED;
+            if (state != ST_UNCONNECTED) {
+                if (state == ST_CONNECTING)
+                    throw new SocketException("Connection in progress");
+                if (state == ST_CONNECTED)
+                    throw new SocketException("Already connected");
+                if (state >= ST_CLOSING)
+                    throw new SocketException("Socket closed");
+                assert false;
+            }
             this.state = ST_CONNECTING;
 
             // invoke beforeTcpConnect hook if not already bound
@@ -499,15 +502,16 @@
             address = InetAddress.getLocalHost();
         int port = isa.getPort();
 
+        ReentrantLock connectLock = readLock;
         try {
-            readLock.lock();
+            connectLock.lock();
             try {
                 boolean connected = false;
                 FileDescriptor fd = beginConnect(address, port);
                 try {
                     maybeConfigureNonBlocking(fd, millis);
                     int n = Net.connect(fd, address, port);
-                    if (statusImpliesRetry(n) && isOpen()) {
+                    if (IOStatus.okayToRetry(n) && isOpen()) {
                         if (millis > 0) {
                             // connect with timeout
                             assert nonBlocking;
@@ -515,7 +519,7 @@
                             do {
                                 long startTime = System.nanoTime();
                                 park(Net.POLLOUT, nanos);
-                                n = Net.polConnectlNow(fd);
+                                n = Net.pollConnectNow(fd);
                                 if (n == 0) {
                                     nanos -= System.nanoTime() - startTime;
                                     if (nanos <= 0)
@@ -526,8 +530,8 @@
                             // connect, no timeout
                             do {
                                 park(Net.POLLOUT);
-                                n = Net.polConnectlNow(fd);
-                            } while ((n == 0 || n == IOStatus.INTERRUPTED) && isOpen());
+                                n = Net.pollConnectNow(fd);
+                            } while (n == 0 && isOpen());
                         }
                     }
                     connected = (n > 0) && isOpen();
@@ -535,7 +539,7 @@
                     endConnect(connected);
                 }
             } finally {
-                readLock.unlock();
+                connectLock.unlock();
             }
         } catch (IOException ioe) {
             close();
@@ -621,7 +625,9 @@
         // accept a connection
         FileDescriptor newfd = new FileDescriptor();
         InetSocketAddress[] isaa = new InetSocketAddress[1];
-        readLock.lock();
+
+        ReentrantLock acceptLock = readLock;
+        acceptLock.lock();
         try {
             int n = 0;
             FileDescriptor fd = beginAccept();
@@ -629,7 +635,7 @@
                 int timeout = this.timeout;
                 maybeConfigureNonBlocking(fd, timeout);
                 n = ServerSocketChannelImpl.accept0(fd, newfd, isaa);
-                if (statusImpliesRetry(n) && isOpen()) {
+                if (IOStatus.okayToRetry(n) && isOpen()) {
                     if (timeout > 0) {
                         // accept with timeout
                         assert nonBlocking;
@@ -649,7 +655,7 @@
                         do {
                             park(Net.POLLIN);
                             n = ServerSocketChannelImpl.accept0(fd, newfd, isaa);
-                        } while (statusImpliesRetry(n) && isOpen());
+                        } while (IOStatus.okayToRetry(n) && isOpen());
                     }
                 }
             } finally {
@@ -657,7 +663,7 @@
                 assert IOStatus.check(n);
             }
         } finally {
-            readLock.unlock();
+            acceptLock.unlock();
         }
 
         // get local address and configure accepted socket to blocking mode
@@ -1157,14 +1163,6 @@
     }
 
     /**
-     * Returns true if the error code is UNAVAILABLE or INTERRUPTED, the
-     * error codes to indicate that an I/O operation should be retried.
-     */
-    private static boolean statusImpliesRetry(int n) {
-        return n == IOStatus.UNAVAILABLE || n == IOStatus.INTERRUPTED;
-    }
-
-    /**
      * Returns the socket protocol family
      */
     private static ProtocolFamily family() {