8165000: Selector.select(timeout) throws IOException when timeout is a large long
Clamp the timeout passed to kevent0 to the largest value that does not provoke the error. Reviewed-by: clanger, alanb
This commit is contained in:
parent
6d3b1a78ad
commit
925586066c
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2016, 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
|
||||
@ -123,7 +123,6 @@ Java_sun_nio_ch_KQueueArrayWrapper_register0(JNIEnv *env, jobject this,
|
||||
kevent(kq, changes, 2, errors, 2, &dontBlock);
|
||||
}
|
||||
|
||||
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_sun_nio_ch_KQueueArrayWrapper_kevent0(JNIEnv *env, jobject this, jint kq,
|
||||
jlong kevAddr, jint kevCount,
|
||||
@ -138,6 +137,15 @@ Java_sun_nio_ch_KQueueArrayWrapper_kevent0(JNIEnv *env, jobject this, jint kq,
|
||||
// Java timeout == -1 : wait forever : timespec timeout of NULL
|
||||
// Java timeout == 0 : return immediately : timespec timeout of zero
|
||||
if (timeout >= 0) {
|
||||
// For some indeterminate reason kevent(2) has been found to fail with
|
||||
// an EINVAL error for timeout values greater than or equal to
|
||||
// 100000001000L. To avoid this problem, clamp the timeout arbitrarily
|
||||
// to the maximum value of a 32-bit signed integer which is
|
||||
// approximately 25 days in milliseconds.
|
||||
const jlong timeoutMax = 0x7fffffff; // java.lang.Integer.MAX_VALUE
|
||||
if (timeout > timeoutMax) {
|
||||
timeout = timeoutMax;
|
||||
}
|
||||
ts.tv_sec = timeout / 1000;
|
||||
ts.tv_nsec = (timeout % 1000) * 1000000; //nanosec = 1 million millisec
|
||||
tsp = &ts;
|
||||
|
83
jdk/test/java/nio/channels/Selector/SelectTimeout.java
Normal file
83
jdk/test/java/nio/channels/Selector/SelectTimeout.java
Normal file
@ -0,0 +1,83 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 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
|
||||
* @bug 8165000
|
||||
* @summary Verify no IOException on OS X for large timeout value in select().
|
||||
* @requires (os.family == "mac")
|
||||
*/
|
||||
import java.io.IOException;
|
||||
import java.nio.channels.Selector;
|
||||
|
||||
public class SelectTimeout {
|
||||
private static final long HUGE_TIMEOUT = 100000001000L;
|
||||
private static final long SLEEP_MILLIS = 10000;
|
||||
|
||||
private static Exception theException;
|
||||
|
||||
public static void main(String[] args)
|
||||
throws IOException, InterruptedException {
|
||||
int failures = 0;
|
||||
long[] timeouts =
|
||||
new long[] {0, HUGE_TIMEOUT/2, HUGE_TIMEOUT - 1, HUGE_TIMEOUT};
|
||||
for (long t : timeouts) {
|
||||
if (!test(t)) {
|
||||
failures++;
|
||||
}
|
||||
}
|
||||
if (failures > 0) {
|
||||
throw new RuntimeException("Test failed!");
|
||||
} else {
|
||||
System.out.println("Test succeeded");
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean test(final long timeout)
|
||||
throws InterruptedException, IOException {
|
||||
theException = null;
|
||||
|
||||
Selector selector = Selector.open();
|
||||
|
||||
Thread t = new Thread(() -> {
|
||||
try {
|
||||
selector.select(timeout);
|
||||
} catch (IOException ioe) {
|
||||
theException = ioe;
|
||||
}
|
||||
});
|
||||
t.start();
|
||||
|
||||
Thread.currentThread().sleep(SLEEP_MILLIS);
|
||||
t.interrupt();
|
||||
|
||||
if (theException == null) {
|
||||
System.out.printf("Test succeeded with timeout %d%n", timeout);
|
||||
return true;
|
||||
} else {
|
||||
System.err.printf("Test failed with timeout %d%n", timeout);
|
||||
theException.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user