infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-18 10:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

8071487: javax/management/monitor/GaugeMonitorDeadlockTest.java timed out

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Jaroslav Bachorik 2015-06-25 11:18:04 +02:00
parent 30cacaa5c9
commit a47dc46f90
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java
View File

@ -27,6 +27,7 @@
* @summary Test that no locks are held when a monitor attribute is sampled
* or notif delivered.
* @author Eamonn McManus
* @library /lib/testlibrary
* @modules java.management
* @run clean GaugeMonitorDeadlockTest
* @run build GaugeMonitorDeadlockTest
@ -48,6 +49,8 @@ import javax.management.ObjectName;
import javax.management.monitor.GaugeMonitor;
import javax.management.monitor.GaugeMonitorMBean;
import jdk.testlibrary.Utils;
public class GaugeMonitorDeadlockTest {
private static enum When {IN_GET_ATTRIBUTE, IN_NOTIFY};
private static long checkingTime;
@ -55,8 +58,7 @@ public class GaugeMonitorDeadlockTest {
public static void main(String[] args) throws Exception {
if (args.length != 1)
throw new Exception("Arg should be test number");
double factor = Double.parseDouble(System.getProperty("test.timeout.factor", "1.0"));
checkingTime = (long)factor*1000;
checkingTime = Utils.adjustTimeout(1000); // default 1s timeout
System.out.println("=== checkingTime = " + checkingTime + "ms");
int testNo = Integer.parseInt(args[0]) - 1;
@ -102,11 +104,12 @@ public class GaugeMonitorDeadlockTest {
monitorProxy.setGranularityPeriod(10L); // 10 ms
monitorProxy.setNotifyHigh(true);
monitorProxy.setNotifyLow(true);
monitorProxy.start();
System.out.println("=== Waiting observedProxy.getGetCount() to be "
+ "changed, presumable deadlock if timeout?");
final int initGetCount = observedProxy.getGetCount();
monitorProxy.start();
long checkedTime = System.currentTimeMillis();
long nowTime;
ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();

4
jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java
View File

@ -38,7 +38,6 @@
import java.lang.management.ManagementFactory;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.Attribute;
import javax.management.JMX;
import javax.management.MBeanServer;
import javax.management.Notification;
@ -96,9 +95,10 @@ public class StringMonitorDeadlockTest {
monitorProxy.setStringToCompare("old");
monitorProxy.setGranularityPeriod(10L); // 10 ms
monitorProxy.setNotifyDiffer(true);
monitorProxy.start();
final int initGetCount = observedProxy.getGetCount();
monitorProxy.start();
int getCount = initGetCount;
for (int i = 0; i < 500; i++) { // 500 * 10 = 5 seconds
getCount = observedProxy.getGetCount();