archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8295792: Clean up old async close code

Browse source 
Reviewed-by: alanb
This commit is contained in:
Daniel Jeliński 2022-10-24 15:25:48 +00:00
parent 5ac6f185ee
commit 2f3f3b6185
12 changed files with 4 additions and 1159 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/unix/native/libnet/Inet4AddressImpl.c
View file

@ -279,7 +279,7 @@ tcp_ping4(JNIEnv *env, SOCKETADDRESS *sa, SOCKETADDRESS *netif, jint timeout,
SET_NONBLOCKING(fd);
sa->sa4.sin_port = htons(7); // echo port
connect_rv = NET_Connect(fd, &sa->sa, sizeof(struct sockaddr_in));
connect_rv = connect(fd, &sa->sa, sizeof(struct sockaddr_in));
// connection established or refused immediately, either way it means
// we were able to reach the host!

2
src/java.base/unix/native/libnet/Inet6AddressImpl.c
View file

@ -479,7 +479,7 @@ tcp_ping6(JNIEnv *env, SOCKETADDRESS *sa, SOCKETADDRESS *netif, jint timeout,
SET_NONBLOCKING(fd);
sa->sa6.sin6_port = htons(7); // echo port
connect_rv = NET_Connect(fd, &sa->sa, sizeof(struct sockaddr_in6));
connect_rv = connect(fd, &sa->sa, sizeof(struct sockaddr_in6));
// connection established or refused immediately, either way it means
// we were able to reach the host!

17
src/java.base/unix/native/libnet/net_util_md.c
View file

@ -224,21 +224,6 @@ void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
}
}
#if defined(_AIX)
/* Initialize stubs for blocking I/O workarounds (see src/solaris/native/java/net/linux_close.c) */
extern void aix_close_init();
void platformInit () {
aix_close_init();
}
#else
void platformInit () {}
#endif
JNIEXPORT jint JNICALL
NET_EnableFastTcpLoopback(int fd) {
return 0;
@ -715,7 +700,7 @@ NET_Wait(JNIEnv *env, jint fd, jint flags, jint timeout)
pfd.events |= POLLOUT;
errno = 0;
read_rv = NET_Poll(&pfd, 1, nanoTimeout / NET_NSEC_PER_MSEC);
read_rv = poll(&pfd, 1, nanoTimeout / NET_NSEC_PER_MSEC);
newNanoTime = JVM_NanoTime(env, 0);
nanoTimeout -= (newNanoTime - prevNanoTime);

4
src/java.base/unix/native/libnet/net_util_md.h
View file

@ -74,10 +74,6 @@ typedef union {
/************************************************************************
* Functions
*/
int NET_Connect(int s, struct sockaddr *addr, int addrlen);
int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout);
void NET_ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
const char* hostname,
int gai_error);