mirror of
https://github.com/openjdk/jdk.git
synced 2026-06-05 02:02:31 +00:00
8050499: (ch) NativeSignal.signal fails with error 316 on OS X
Do not throw an exception when ESRCH returned by pthread_kill() on OS X. Reviewed-by: alanb
This commit is contained in:
parent
e49fa68b05
commit
119f59143f
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 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
|
||||
@ -93,6 +93,10 @@ Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
|
||||
#else
|
||||
ret = pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL);
|
||||
#endif
|
||||
#ifdef MACOSX
|
||||
if (ret != 0 && ret != ESRCH)
|
||||
#else
|
||||
if (ret != 0)
|
||||
#endif
|
||||
JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
|
||||
}
|
||||
|
||||
@ -0,0 +1,147 @@
|
||||
/*
|
||||
* 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 8050499
|
||||
* @summary Attempt to provoke error 316 on OS X in NativeSignal.signal()
|
||||
*/
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.channels.DatagramChannel;
|
||||
|
||||
public class StressNativeSignal {
|
||||
private UDPThread udpThread;
|
||||
private ServerSocketThread serverSocketThread;
|
||||
|
||||
StressNativeSignal() {
|
||||
try {
|
||||
serverSocketThread = new ServerSocketThread();
|
||||
serverSocketThread.start();
|
||||
|
||||
udpThread = new UDPThread();
|
||||
udpThread.start();
|
||||
} catch (Exception z) {
|
||||
z.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Throwable {
|
||||
StressNativeSignal test = new StressNativeSignal();
|
||||
try {
|
||||
Thread.sleep(3000);
|
||||
} catch (Exception z) {
|
||||
z.printStackTrace(System.err);
|
||||
}
|
||||
|
||||
test.shutdown();
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
udpThread.terminate();
|
||||
try {
|
||||
udpThread.join();
|
||||
} catch (Exception z) {
|
||||
z.printStackTrace(System.err);
|
||||
}
|
||||
|
||||
serverSocketThread.terminate();
|
||||
try {
|
||||
serverSocketThread.join();
|
||||
} catch (Exception z) {
|
||||
z.printStackTrace(System.err);
|
||||
}
|
||||
}
|
||||
|
||||
public class ServerSocketThread extends Thread {
|
||||
private volatile boolean shouldTerminate;
|
||||
private ServerSocket socket;
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
socket = new ServerSocket(1122);
|
||||
Socket client = socket.accept();
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
|
||||
shouldTerminate = false;
|
||||
while (!shouldTerminate) {
|
||||
String msg = reader.readLine();
|
||||
}
|
||||
} catch (Exception z) {
|
||||
if (!shouldTerminate) {
|
||||
z.printStackTrace(System.err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void terminate() {
|
||||
shouldTerminate = true;
|
||||
try {
|
||||
socket.close();
|
||||
} catch (Exception z) {
|
||||
z.printStackTrace(System.err);
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class UDPThread extends Thread {
|
||||
private DatagramChannel channel;
|
||||
private volatile boolean shouldTerminate;
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
channel = DatagramChannel.open();
|
||||
channel.setOption(StandardSocketOptions.SO_RCVBUF, 6553600);
|
||||
channel.bind(new InetSocketAddress(19870));
|
||||
} catch (IOException z) {
|
||||
z.printStackTrace(System.err);
|
||||
}
|
||||
|
||||
ByteBuffer buf = ByteBuffer.allocate(6553600);
|
||||
shouldTerminate = false;
|
||||
while (!shouldTerminate) {
|
||||
try {
|
||||
buf.rewind();
|
||||
channel.receive(buf);
|
||||
} catch (IOException z) {
|
||||
if (!shouldTerminate) {
|
||||
z.printStackTrace(System.err);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void terminate() {
|
||||
shouldTerminate = true;
|
||||
try {
|
||||
channel.close();
|
||||
} catch (Exception z) {
|
||||
z.printStackTrace(System.err);
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user