stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8172547: (se) Selector.select(Long.MAX_VALUE) fires repeatedly

Browse Source 
Clamp the jlong-valued select() timeout to INT_MAX for struct timeval

Reviewed-by: rriggs, clanger, alanb
This commit is contained in:
Brian Burkhalter 2017-01-19 13:46:45 -08:00
parent d9d9d8701a
commit 5aa0f30214
2 changed files with 63 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/java.base/windows/native/libnio/ch/WindowsSelectorImpl.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2017, 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
@ -32,6 +32,7 @@
#define FD_SETSIZE 1024
#include <limits.h>
#include <stdlib.h>
#include <winsock2.h>
@ -75,8 +76,18 @@ Java_sun_nio_ch_WindowsSelectorImpl_00024SubSelector_poll0(JNIEnv *env, jobject
tv = NULL;
} else {
tv = &timevalue;
tv->tv_sec = (long)(timeout / 1000);
tv->tv_usec = (long)((timeout % 1000) * 1000);
jlong sec = timeout / 1000;
//
// struct timeval members are signed 32-bit integers so the
// signed 64-bit jlong needs to be clamped
//
if (sec > INT_MAX) {
tv->tv_sec = INT_MAX;
tv->tv_usec = 0;
} else {
tv->tv_sec = (long)sec;
tv->tv_usec = (long)((timeout % 1000) * 1000);
}
}
/* Set FD_SET structures required for select */

82
jdk/test/java/nio/channels/Selector/SelectTimeout.java
View File

@ -1,46 +1,50 @@
/*
* 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.
*/
* Copyright (c) 2016, 2017, 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")
* @bug 8165000 8172547
* @summary Verify no IOException on OS X for large timeout value in select()
* and that timeout does not occur too early on Windows.
* @requires (os.family == "mac" | os.family == "windows")
*/
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 final long BIG_TIMEOUT = 100_000_001_000L; // 8165000
private static final long BIGGER_TIMEOUT = 850_000_000_000_000L; // 8172547
private static final long SLEEP_MILLIS = 10000;
private static Exception theException;
private static volatile Exception theException;
private static volatile boolean isTimedOut;
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};
new long[] {1, BIG_TIMEOUT/2, BIG_TIMEOUT - 1, BIG_TIMEOUT,
BIGGER_TIMEOUT};
for (long t : timeouts) {
if (!test(t)) {
failures++;
@ -61,23 +65,35 @@ public class SelectTimeout {
Thread t = new Thread(() -> {
try {
isTimedOut = false;
selector.select(timeout);
isTimedOut = true;
} catch (IOException ioe) {
theException = ioe;
}
});
t.start();
Thread.currentThread().sleep(SLEEP_MILLIS);
t.interrupt();
t.join(SLEEP_MILLIS);
boolean result;
if (theException == null) {
System.out.printf("Test succeeded with timeout %d%n", timeout);
return true;
if (timeout > SLEEP_MILLIS && isTimedOut) {
System.err.printf("Test timed out early with timeout %d%n",
timeout);
result = false;
} else {
System.out.printf("Test succeeded with timeout %d%n", timeout);
result = true;
}
} else {
System.err.printf("Test failed with timeout %d%n", timeout);
theException.printStackTrace();
return false;
result = false;
}
t.interrupt();
return result;
}
}