OpenJDK / amber / amber
changeset 2933:08ea3ecb912c
6512493: TEST_BUG: unexpected LockInfo failure in LockedSynchronizers.java
Summary: Retry a few times to check thread status before reporting failure
Reviewed-by: swamyv
| author | mchung |
|---|---|
| date | Tue, 26 May 2009 18:07:14 -0700 |
| parents | e27a79fe5e7a |
| children | 7b3a71a2fc3c |
| files | jdk/test/java/lang/management/ThreadMXBean/LockingThread.java jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java |
| diffstat | 2 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java Tue May 26 18:02:44 2009 -0700 +++ b/jdk/test/java/lang/management/ThreadMXBean/LockingThread.java Tue May 26 18:07:14 2009 -0700 @@ -66,6 +66,8 @@ throw new RuntimeException(e); } } + Utils.waitForBlockWaitingState(t1); + Utils.waitForBlockWaitingState(t2); } static long[] getThreadIds() { return new long[] {t1.getId(), t2.getId()};
--- a/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java Tue May 26 18:02:44 2009 -0700 +++ b/jdk/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java Tue May 26 18:07:14 2009 -0700 @@ -83,11 +83,24 @@ void waitUntilDeadlock() { barr.await(); - // sleep a little while to wait until threads are blocked. - try { - Thread.sleep(100); - } catch (InterruptedException e) { - // ignore + + for (int i=0; i < 100; i++) { + // sleep a little while to wait until threads are blocked. + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // ignore + } + boolean retry = false; + for (Thread t: dThreads) { + if (t.getState() == Thread.State.RUNNABLE) { + retry = true; + break; + } + } + if (!retry) { + break; + } } }