8217500: (sc) Move SocketChannelImpl's remaining native methods to Net
Reviewed-by: bpb
--- a/src/java.base/share/classes/sun/nio/ch/Net.java Wed Jan 23 13:37:12 2019 +0100
+++ b/src/java.base/share/classes/sun/nio/ch/Net.java Wed Jan 23 13:16:16 2019 +0000
@@ -525,10 +525,27 @@
throws IOException;
/**
+ * Polls a connecting socket to test if the connection has been established.
+ *
+ * @apiNote This method is public to allow it be used by code in jdk.sctp.
+ *
+ * @param timeout the timeout to wait; 0 to not wait, -1 to wait indefinitely
+ * @return 1 if connected, 0 if not connected, or IOS_INTERRUPTED
+ */
+ public static native int pollConnect(FileDescriptor fd, long timeout)
+ throws IOException;
+
+ /**
* Return the number of bytes in the socket input buffer.
*/
static native int available(FileDescriptor fd) throws IOException;
+ /**
+ * Send one byte of urgent data (MSG_OOB) on the socket.
+ */
+ static native int sendOOB(FileDescriptor fd, byte data) throws IOException;
+
+
// -- Multicast support --
/**
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java Wed Jan 23 13:37:12 2019 +0100
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java Wed Jan 23 13:16:16 2019 +0000
@@ -65,7 +65,7 @@
implements SelChImpl
{
// Used to make native read and write calls
- private static NativeDispatcher nd;
+ private static final NativeDispatcher nd = new SocketDispatcher();
// Our file descriptor object
private final FileDescriptor fd;
@@ -517,10 +517,10 @@
beginWrite(blocking);
if (blocking) {
do {
- n = sendOutOfBandData(fd, b);
+ n = Net.sendOOB(fd, b);
} while (n == IOStatus.INTERRUPTED && isOpen());
} else {
- n = sendOutOfBandData(fd, b);
+ n = Net.sendOOB(fd, b);
}
} finally {
endWrite(blocking, n > 0);
@@ -772,10 +772,10 @@
int n = 0;
if (blocking) {
do {
- n = checkConnect(fd, true);
+ n = Net.pollConnect(fd, -1);
} while ((n == 0 || n == IOStatus.INTERRUPTED) && isOpen());
} else {
- n = checkConnect(fd, false);
+ n = Net.pollConnect(fd, 0);
}
connected = (n > 0);
} finally {
@@ -1112,19 +1112,4 @@
sb.append(']');
return sb.toString();
}
-
-
- // -- Native methods --
-
- private static native int checkConnect(FileDescriptor fd, boolean block)
- throws IOException;
-
- private static native int sendOutOfBandData(FileDescriptor fd, byte data)
- throws IOException;
-
- static {
- IOUtil.load();
- nd = new SocketDispatcher();
- }
-
}
--- a/src/java.base/unix/native/libnio/ch/Net.c Wed Jan 23 13:37:12 2019 +0100
+++ b/src/java.base/unix/native/libnio/ch/Net.c Wed Jan 23 13:16:16 2019 +0000
@@ -719,6 +719,50 @@
}
}
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_pollConnect(JNIEnv *env, jobject this, jobject fdo, jlong timeout)
+{
+ jint fd = fdval(env, fdo);
+ struct pollfd poller;
+ int result;
+
+ poller.fd = fd;
+ poller.events = POLLOUT;
+ poller.revents = 0;
+ if (timeout < -1) {
+ timeout = -1;
+ } else if (timeout > INT_MAX) {
+ timeout = INT_MAX;
+ }
+
+ result = poll(&poller, 1, (int)timeout);
+
+ if (result > 0) {
+ int error = 0;
+ socklen_t n = sizeof(int);
+ errno = 0;
+ result = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &n);
+ if (result < 0) {
+ return handleSocketError(env, errno);
+ } else if (error) {
+ return handleSocketError(env, error);
+ } else if ((poller.revents & POLLHUP) != 0) {
+ return handleSocketError(env, ENOTCONN);
+ }
+ // connected
+ return 1;
+ } else if (result == 0) {
+ return 0;
+ } else {
+ if (errno == EINTR) {
+ return IOS_INTERRUPTED;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "poll failed");
+ return IOS_THROWN;
+ }
+ }
+}
+
JNIEXPORT jshort JNICALL
Java_sun_nio_ch_Net_pollinValue(JNIEnv *env, jclass this)
{
@@ -755,6 +799,12 @@
return (jshort)POLLOUT;
}
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_sendOOB(JNIEnv* env, jclass this, jobject fdo, jbyte b)
+{
+ int n = send(fdval(env, fdo), (const void*)&b, 1, MSG_OOB);
+ return convertReturnVal(env, n, JNI_FALSE);
+}
/* Declared in nio_util.h */
--- a/src/java.base/unix/native/libnio/ch/SocketChannelImpl.c Wed Jan 23 13:37:12 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <poll.h>
-
-#if __linux__
-#include <netinet/in.h>
-#endif
-
-#include "jni.h"
-#include "jni_util.h"
-#include "net_util.h"
-#include "jvm.h"
-#include "jlong.h"
-#include "sun_nio_ch_SocketChannelImpl.h"
-#include "nio_util.h"
-#include "nio.h"
-
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv *env, jobject this,
- jobject fdo, jboolean block)
-{
- int error = 0;
- socklen_t n = sizeof(int);
- jint fd = fdval(env, fdo);
- int result = 0;
- struct pollfd poller;
-
- poller.fd = fd;
- poller.events = POLLOUT;
- poller.revents = 0;
- result = poll(&poller, 1, block ? -1 : 0);
-
- if (result < 0) {
- if (errno == EINTR) {
- return IOS_INTERRUPTED;
- } else {
- JNU_ThrowIOExceptionWithLastError(env, "poll failed");
- return IOS_THROWN;
- }
- }
- if (!block && (result == 0))
- return IOS_UNAVAILABLE;
-
- if (result > 0) {
- errno = 0;
- result = getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &n);
- if (result < 0) {
- return handleSocketError(env, errno);
- } else if (error) {
- return handleSocketError(env, error);
- } else if ((poller.revents & POLLHUP) != 0) {
- return handleSocketError(env, ENOTCONN);
- }
- // connected
- return 1;
- }
- return 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData(JNIEnv* env, jclass this,
- jobject fdo, jbyte b)
-{
- int n = send(fdval(env, fdo), (const void*)&b, 1, MSG_OOB);
- return convertReturnVal(env, n, JNI_FALSE);
-}
--- a/src/java.base/unix/native/libnio/ch/SocketDispatcher.c Wed Jan 23 13:37:12 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2000, 2009, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jlong.h"
-
-/* this is a fake c file to make the build happy since there is no
- real SocketDispatcher.c file on Solaris but there is on windows. */
-
-static jfieldID fd_fdID; /* for jint 'fd' in java.io.FileDescriptor */
--- a/src/java.base/windows/native/libnio/ch/Net.c Wed Jan 23 13:37:12 2019 +0100
+++ b/src/java.base/windows/native/libnio/ch/Net.c Wed Jan 23 13:16:16 2019 +0000
@@ -77,6 +77,11 @@
NULL, 0, &bytesReturned, NULL, NULL);
}
+jint handleSocketError(JNIEnv *env, int errorValue)
+{
+ NET_ThrowNew(env, errorValue, NULL);
+ return IOS_THROWN;
+}
JNIEXPORT void JNICALL
Java_sun_nio_ch_Net_initIDs(JNIEnv *env, jclass clazz)
@@ -607,6 +612,59 @@
return rv;
}
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_pollConnect(JNIEnv* env, jclass this, jobject fdo, jlong timeout)
+{
+ int optError = 0;
+ int result;
+ int n = sizeof(int);
+ jint fd = fdval(env, fdo);
+ fd_set wr, ex;
+ struct timeval t;
+
+ FD_ZERO(&wr);
+ FD_ZERO(&ex);
+ FD_SET((u_int)fd, &wr);
+ FD_SET((u_int)fd, &ex);
+
+ if (timeout >= 0) {
+ t.tv_sec = (long)(timeout / 1000);
+ t.tv_usec = (timeout % 1000) * 1000;
+ }
+
+ result = select(fd+1, 0, &wr, &ex, (timeout >= 0) ? &t : NULL);
+
+ if (result == SOCKET_ERROR) {
+ handleSocketError(env, WSAGetLastError());
+ return IOS_THROWN;
+ } else if (result == 0) {
+ return 0;
+ } else {
+ // connection established if writable and no error to check
+ if (FD_ISSET(fd, &wr) && !FD_ISSET(fd, &ex)) {
+ return 1;
+ }
+ result = getsockopt((SOCKET)fd,
+ SOL_SOCKET,
+ SO_ERROR,
+ (char *)&optError,
+ &n);
+ if (result == SOCKET_ERROR) {
+ int lastError = WSAGetLastError();
+ if (lastError == WSAEINPROGRESS) {
+ return IOS_UNAVAILABLE;
+ }
+ NET_ThrowNew(env, lastError, "getsockopt");
+ return IOS_THROWN;
+ }
+ if (optError != NO_ERROR) {
+ handleSocketError(env, optError);
+ return IOS_THROWN;
+ }
+ return 0;
+ }
+}
+
JNIEXPORT jshort JNICALL
Java_sun_nio_ch_Net_pollinValue(JNIEnv *env, jclass this)
{
@@ -642,3 +700,19 @@
{
return (jshort)POLLCONN;
}
+
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Net_sendOOB(JNIEnv* env, jclass this, jobject fdo, jbyte b)
+{
+ int n = send(fdval(env, fdo), (const char*)&b, 1, MSG_OOB);
+ if (n == SOCKET_ERROR) {
+ if (WSAGetLastError() == WSAEWOULDBLOCK) {
+ return IOS_UNAVAILABLE;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "send failed");
+ return IOS_THROWN;
+ }
+ } else {
+ return n;
+ }
+}
--- a/src/java.base/windows/native/libnio/ch/SocketChannelImpl.c Wed Jan 23 13:37:12 2019 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include <windows.h>
-#include <winsock2.h>
-#include <ctype.h>
-#include "jni.h"
-#include "jni_util.h"
-#include "jvm.h"
-#include "jlong.h"
-#include "sun_nio_ch_SocketChannelImpl.h"
-
-#include "nio.h"
-#include "nio_util.h"
-#include "net_util.h"
-
-
-static jfieldID ia_addrID; /* java.net.InetAddress.address */
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_SocketChannelImpl_initIDs(JNIEnv *env, jclass cls)
-{
- CHECK_NULL(cls = (*env)->FindClass(env, "java/net/InetAddress"));
- CHECK_NULL(ia_addrID = (*env)->GetFieldID(env, cls, "address", "I"));
-}
-
-jint
-handleSocketError(JNIEnv *env, int errorValue)
-{
- NET_ThrowNew(env, errorValue, NULL);
- return IOS_THROWN;
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv *env, jobject this,
- jobject fdo, jboolean block)
-{
- int optError = 0;
- int result;
- int n = sizeof(int);
- jint fd = fdval(env, fdo);
- fd_set wr, ex;
- struct timeval t = { 0, 0 };
-
- FD_ZERO(&wr);
- FD_ZERO(&ex);
- FD_SET((u_int)fd, &wr);
- FD_SET((u_int)fd, &ex);
-
- result = select(fd+1, 0, &wr, &ex, block ? NULL : &t);
-
- if (result == 0) { /* timeout */
- return block ? 0 : IOS_UNAVAILABLE;
- } else {
- if (result == SOCKET_ERROR) { /* select failed */
- handleSocketError(env, WSAGetLastError());
- return IOS_THROWN;
- }
- }
-
- // connection established if writable and no error to check
- if (FD_ISSET(fd, &wr) && !FD_ISSET(fd, &ex)) {
- return 1;
- }
-
- result = getsockopt((SOCKET)fd,
- SOL_SOCKET,
- SO_ERROR,
- (char *)&optError,
- &n);
- if (result == SOCKET_ERROR) {
- int lastError = WSAGetLastError();
- if (lastError == WSAEINPROGRESS) {
- return IOS_UNAVAILABLE;
- }
- NET_ThrowNew(env, lastError, "getsockopt");
- return IOS_THROWN;
- }
- if (optError != NO_ERROR) {
- handleSocketError(env, optError);
- return IOS_THROWN;
- }
-
- return 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData(JNIEnv* env, jclass this,
- jobject fdo, jbyte b)
-{
- int n = send(fdval(env, fdo), (const char*)&b, 1, MSG_OOB);
- if (n == SOCKET_ERROR) {
- handleSocketError(env, WSAGetLastError());
- return IOS_THROWN;
- } else {
- return n;
- }
-}
--- a/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java Wed Jan 23 13:37:12 2019 +0100
+++ b/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java Wed Jan 23 13:16:16 2019 +0000
@@ -478,7 +478,7 @@
}
if (!isBlocking()) {
for (;;) {
- n = checkConnect(fd, false, readyToConnect);
+ n = Net.pollConnect(fd, 0);
if ( (n == IOStatus.INTERRUPTED)
&& isOpen())
continue;
@@ -486,7 +486,7 @@
}
} else {
for (;;) {
- n = checkConnect(fd, true, readyToConnect);
+ n = Net.pollConnect(fd, -1);
if (n == 0) {
// Loop in case of
// spurious notifications
@@ -1104,9 +1104,6 @@
InetAddress addr, int port, int assocId, int streamNumber,
boolean unordered, int ppid) throws IOException;
- private static native int checkConnect(FileDescriptor fd, boolean block,
- boolean ready) throws IOException;
-
static {
IOUtil.load(); /* loads nio & net native libraries */
java.security.AccessController.doPrivileged(
--- a/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c Wed Jan 23 13:37:12 2019 +0100
+++ b/src/jdk.sctp/unix/native/libsctp/SctpChannelImpl.c Wed Jan 23 13:16:16 2019 +0000
@@ -72,10 +72,6 @@
jint handleSocketError(JNIEnv *env, jint errorValue);
-/* use SocketChannelImpl's checkConnect implementation */
-extern jint Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv* env,
- jobject this, jobject fdo, jboolean block, jboolean ready);
-
/*
* Class: sun_nio_ch_sctp_SctpChannelImpl
* Method: initIDs
@@ -598,13 +594,3 @@
return rv;
}
-/*
- * Class: sun_nio_ch_sctp_SctpChannelImpl
- * Method: checkConnect
- * Signature: (Ljava/io/FileDescriptor;ZZ)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_checkConnect
- (JNIEnv* env, jobject this, jobject fdo, jboolean block, jboolean ready) {
- return Java_sun_nio_ch_SocketChannelImpl_checkConnect(env, this,
- fdo, block, ready);
-}
--- a/test/jdk/java/nio/channels/SocketChannel/SendUrgentData.java Wed Jan 23 13:37:12 2019 +0100
+++ b/test/jdk/java/nio/channels/SocketChannel/SendUrgentData.java Wed Jan 23 13:16:16 2019 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -133,9 +133,7 @@
throw new RuntimeException("Unexpected message", ex);
}
} else if (osName.contains("windows")) {
- if (!(ex instanceof SocketException)) {
- throw new RuntimeException("Unexpected exception", ex);
- } else if (!ex.getMessage().contains("Resource temporarily unavailable")) {
+ if (!ex.getMessage().equals("Socket buffer full")) {
throw new RuntimeException("Unexpected message", ex);
}
} else {