archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8223442: java/nio/channels/SocketChannel/AdaptorStreams.java testConcurrentTimedReadWrite3(): failure

Browse source 
Reviewed-by: michaelm
This commit is contained in:
Alan Bateman 2019-05-16 17:06:53 +01:00
parent bc264ba95b
commit a817ac3456
5 changed files with 60 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 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
@ -25,19 +25,16 @@
package sun.nio.ch;
import java.io.*;
import java.net.*;
import java.io.FileDescriptor;
import java.io.IOException;
/**
* Allows different platforms to call different native methods
* for read and write operations.
*/
class DatagramDispatcher extends NativeDispatcher
{
static {
IOUtil.load();
}
class DatagramDispatcher extends NativeDispatcher {
DatagramDispatcher() { }
int read(FileDescriptor fd, long address, int len) throws IOException {
return read0(fd, address, len);
@ -56,18 +53,24 @@ class DatagramDispatcher extends NativeDispatcher
}
void close(FileDescriptor fd) throws IOException {
SocketDispatcher.close0(fd);
SocketDispatcher.invalidateAndClose(fd);
}
static native int read0(FileDescriptor fd, long address, int len)
// -- Native methods --
private static native int read0(FileDescriptor fd, long address, int len)
throws IOException;
static native long readv0(FileDescriptor fd, long address, int len)
private static native long readv0(FileDescriptor fd, long address, int len)
throws IOException;
static native int write0(FileDescriptor fd, long address, int len)
private static native int write0(FileDescriptor fd, long address, int len)
throws IOException;
static native long writev0(FileDescriptor fd, long address, int len)
private static native long writev0(FileDescriptor fd, long address, int len)
throws IOException;
static {
IOUtil.load();
}
}

29
src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
View file

@ -28,12 +28,18 @@ package sun.nio.ch;
import java.io.FileDescriptor;
import java.io.IOException;
import jdk.internal.access.JavaIOFileDescriptorAccess;
import jdk.internal.access.SharedSecrets;
/**
* Allows different platforms to call different native methods
* for read and write operations.
*/
class SocketDispatcher extends NativeDispatcher {
private static final JavaIOFileDescriptorAccess fdAccess =
SharedSecrets.getJavaIOFileDescriptorAccess();
SocketDispatcher() { }
int read(FileDescriptor fd, long address, int len) throws IOException {
@ -53,30 +59,35 @@ class SocketDispatcher extends NativeDispatcher {
}
void preClose(FileDescriptor fd) throws IOException {
preClose0(fd);
throw new UnsupportedOperationException();
}
void close(FileDescriptor fd) throws IOException {
close0(fd);
invalidateAndClose(fd);
}
static void invalidateAndClose(FileDescriptor fd) throws IOException {
assert fd.valid();
int fdVal = fdAccess.get(fd);
fdAccess.set(fd, -1);
close0(fdVal);
}
// -- Native methods --
static native int read0(FileDescriptor fd, long address, int len)
private static native int read0(FileDescriptor fd, long address, int len)
throws IOException;
static native long readv0(FileDescriptor fd, long address, int len)
private static native long readv0(FileDescriptor fd, long address, int len)
throws IOException;
static native int write0(FileDescriptor fd, long address, int len)
private static native int write0(FileDescriptor fd, long address, int len)
throws IOException;
static native long writev0(FileDescriptor fd, long address, int len)
private static native long writev0(FileDescriptor fd, long address, int len)
throws IOException;
static native void preClose0(FileDescriptor fd) throws IOException;
static native void close0(FileDescriptor fd) throws IOException;
private static native void close0(int fdVal) throws IOException;
static {
IOUtil.load();

3
src/java.base/windows/native/libnio/ch/Net.c
View file

@ -620,7 +620,6 @@ Java_sun_nio_ch_Net_poll(JNIEnv* env, jclass this, jobject fdo, jint events, jlo
int rv;
int revents = 0;
struct timeval t;
int lastError = 0;
fd_set rd, wr, ex;
jint fd = fdval(env, fdo);
@ -643,7 +642,7 @@ Java_sun_nio_ch_Net_poll(JNIEnv* env, jclass this, jobject fdo, jint events, jlo
/* save last winsock error */
if (rv == SOCKET_ERROR) {
handleSocketError(env, lastError);
handleSocketError(env, WSAGetLastError());
return IOS_THROWN;
} else if (rv >= 0) {
rv = 0;

18
src/java.base/windows/native/libnio/ch/SocketDispatcher.c
View file

@ -280,24 +280,8 @@ Java_sun_nio_ch_SocketDispatcher_writev0(JNIEnv *env, jclass clazz,
}
JNIEXPORT void JNICALL
Java_sun_nio_ch_SocketDispatcher_preClose0(JNIEnv *env, jclass clazz,
jobject fdo)
Java_sun_nio_ch_SocketDispatcher_close0(JNIEnv *env, jclass clazz, jint fd)
{
jint fd = fdval(env, fdo);
struct linger l;
int len = sizeof(l);
if (getsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&l, &len) == 0) {
if (l.l_onoff == 0) {
shutdown(fd, SD_SEND);
}
}
}
JNIEXPORT void JNICALL
Java_sun_nio_ch_SocketDispatcher_close0(JNIEnv *env, jclass clazz,
jobject fdo)
{
jint fd = fdval(env, fdo);
if (closesocket(fd) == SOCKET_ERROR) {
JNU_ThrowIOExceptionWithLastError(env, "Socket close failed");
}