openjdk/jdk8u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk8u.git synced 2025-12-15 14:22:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

8031694: [macosx] TwentyThousandTest test intermittently hangs

Browse Source 
Reviewed-by: art, anthony
This commit is contained in:
Oleg Pekhovskiy 2014-02-13 22:00:42 +04:00
parent 59b710461e
commit dd1ae2895e
2 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/share/classes/java/awt/EventQueue.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2014, 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
@ -1093,6 +1093,13 @@ public class EventQueue {
dispatchThread = null;
}
AWTAutoShutdown.getInstance().notifyThreadFree(edt);
/*
* Event was posted after EDT events pumping had stopped, so start
* another EDT to handle this event
*/
if (peekEvent() != null) {
initDispatchThread();
}
} finally {
pushPopLock.unlock();
}

100
jdk/test/java/awt/EventDispatchThread/EDTShutdownTest/EDTShutdownTest.java Normal file
View File

@ -0,0 +1,100 @@
/*
* Copyright (c) 2014, 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 8031694
@summary [macosx] TwentyThousandTest test intermittently hangs
@author Oleg Pekhovskiy
@run main EDTShutdownTest
*/
import java.awt.EventQueue;
import java.awt.Toolkit;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import sun.awt.AWTAccessor;
public class EDTShutdownTest {
private static boolean passed = false;
public static void main(String[] args) {
// Force EDT start with InvocationEvent
EventQueue.invokeLater(() -> {
// EventQueue is empty now
EventQueue queue = Toolkit.getDefaultToolkit()
.getSystemEventQueue();
Thread thread = AWTAccessor.getEventQueueAccessor()
.getDispatchThread(queue);
try {
/*
* Clear EventDispatchThread.doDispatch flag to break message
* loop in EventDispatchThread.pumpEventsForFilter()
*/
Method stopDispatching = thread.getClass()
.getDeclaredMethod("stopDispatching", null);
stopDispatching.setAccessible(true);
stopDispatching.invoke(thread, null);
/*
* Post another InvocationEvent that must be handled by another
* instance of EDT
*/
EventQueue.invokeLater(() -> {
passed = true;
});
}
catch (InvocationTargetException | NoSuchMethodException
| IllegalAccessException e) {
}
});
// Wait for EDT shutdown
EventQueue queue = Toolkit.getDefaultToolkit().getSystemEventQueue();
Thread thread = AWTAccessor.getEventQueueAccessor()
.getDispatchThread(queue);
try {
thread.join();
/*
* Wait for another EDT instance to handle the InvocationEvent
* and shutdown
*/
thread = AWTAccessor.getEventQueueAccessor()
.getDispatchThread(queue);
if (thread != null) {
thread.join();
}
}
catch (InterruptedException e) {
}
if (passed) {
System.out.println("Test PASSED!");
}
else {
throw new RuntimeException("Test FAILED!");
}
}
}