ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/JSR166TestCase.java

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.255 by jsr166, Sun Jul 28 18:09:25 2019 UTC vs.
Revision 1.271 by jsr166, Sat Feb 1 18:52:17 2020 UTC

#	Line 49 | Line 49 | import java.io.ByteArrayOutputStream;
49		import java.io.ObjectInputStream;
50		import java.io.ObjectOutputStream;
51		import java.lang.management.ManagementFactory;
52	+	import java.lang.management.LockInfo;
53		import java.lang.management.ThreadInfo;
54		import java.lang.management.ThreadMXBean;
55		import java.lang.reflect.Constructor;
#	Line 243 | Line 244 | public class JSR166TestCase extends Test
244		}
245		}
246
247	+	private static final ThreadMXBean THREAD_MXBEAN
248	+	= ManagementFactory.getThreadMXBean();
249	+
250		/**
251		* The scaling factor to apply to standard delays used in tests.
252		* May be initialized from any of:
#	Line 284 | Line 288 | public class JSR166TestCase extends Test
288		static volatile TestCase currentTestCase;
289		// static volatile int currentRun = 0;
290		static {
291	<	Runnable checkForWedgedTest = new Runnable() { public void run() {
291	>	Runnable wedgedTestDetector = new Runnable() { public void run() {
292		// Avoid spurious reports with enormous runsPerTest.
293		// A single test case run should never take more than 1 second.
294		// But let's cap it at the high end too ...
#	Line 310 | Line 314 | public class JSR166TestCase extends Test
314		}
315		lastTestCase = currentTestCase;
316		}}};
317	<	Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
317	>	Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
318		thread.setDaemon(true);
319		thread.start();
320		}
#	Line 354 | Line 358 | public class JSR166TestCase extends Test
358		// Never report first run of any test; treat it as a
359		// warmup run, notably to trigger all needed classloading,
360		if (i > 0)
361	<	System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
361	>	System.out.printf("%s: %d%n", toString(), elapsedMillis);
362		}
363		}
364
#	Line 657 | Line 661 | public class JSR166TestCase extends Test
661		public static long MEDIUM_DELAY_MS;
662		public static long LONG_DELAY_MS;
663
664	+	/**
665	+	* A delay significantly longer than LONG_DELAY_MS.
666	+	* Use this in a thread that is waited for via awaitTermination(Thread).
667	+	*/
668	+	public static long LONGER_DELAY_MS;
669	+
670		private static final long RANDOM_TIMEOUT;
671		private static final long RANDOM_EXPIRED_TIMEOUT;
672		private static final TimeUnit RANDOM_TIMEUNIT;
#	Line 685 | Line 695 | public class JSR166TestCase extends Test
695		static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
696
697		/**
698	+	* Returns a random boolean; a "coin flip".
699	+	*/
700	+	static boolean randomBoolean() {
701	+	return ThreadLocalRandom.current().nextBoolean();
702	+	}
703	+
704	+	/**
705	+	* Returns a random element from given choices.
706	+	*/
707	+	<T> T chooseRandomly(List<T> choices) {
708	+	return choices.get(ThreadLocalRandom.current().nextInt(choices.size()));
709	+	}
710	+
711	+	/**
712	+	* Returns a random element from given choices.
713	+	*/
714	+	<T> T chooseRandomly(T... choices) {
715	+	return choices[ThreadLocalRandom.current().nextInt(choices.length)];
716	+	}
717	+
718	+	/**
719		* Returns the shortest timed delay. This can be scaled up for
720		* slow machines using the jsr166.delay.factor system property,
721		* or via jtreg's -timeoutFactor: flag.
#	Line 702 | Line 733 | public class JSR166TestCase extends Test
733		SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
734		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
735		LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
736	+	LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
737		}
738
739		private static final long TIMEOUT_DELAY_MS
#	Line 740 | Line 772 | public class JSR166TestCase extends Test
772		*/
773		public void threadRecordFailure(Throwable t) {
774		System.err.println(t);
775	<	dumpTestThreads();
776	<	threadFailure.compareAndSet(null, t);
775	>	if (threadFailure.compareAndSet(null, t))
776	>	dumpTestThreads();
777		}
778
779		public void setUp() {
#	Line 1062 | Line 1094 | public class JSR166TestCase extends Test
1094		}
1095		}
1096
1097	+	/** Returns true if thread info might be useful in a thread dump. */
1098	+	static boolean threadOfInterest(ThreadInfo info) {
1099	+	final String name = info.getThreadName();
1100	+	String lockName;
1101	+	if (name == null)
1102	+	return true;
1103	+	if (name.equals("Signal Dispatcher")
1104	+	|| name.equals("WedgedTestDetector"))
1105	+	return false;
1106	+	if (name.equals("Reference Handler")) {
1107	+	// Reference Handler stacktrace changed in JDK-8156500
1108	+	StackTraceElement[] stackTrace; String methodName;
1109	+	if ((stackTrace = info.getStackTrace()) != null
1110	+	&& stackTrace.length > 0
1111	+	&& (methodName = stackTrace[0].getMethodName()) != null
1112	+	&& methodName.equals("waitForReferencePendingList"))
1113	+	return false;
1114	+	// jdk8 Reference Handler stacktrace
1115	+	if ((lockName = info.getLockName()) != null
1116	+	&& lockName.startsWith("java.lang.ref"))
1117	+	return false;
1118	+	}
1119	+	if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1120	+	&& (lockName = info.getLockName()) != null
1121	+	&& lockName.startsWith("java.lang.ref"))
1122	+	return false;
1123	+	if (name.startsWith("ForkJoinPool.commonPool-worker")
1124	+	&& (lockName = info.getLockName()) != null
1125	+	&& lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1126	+	return false;
1127	+	return true;
1128	+	}
1129	+
1130		/**
1131		* A debugging tool to print stack traces of most threads, as jstack does.
1132		* Uninteresting threads are filtered out.
#	Line 1076 | Line 1141 | public class JSR166TestCase extends Test
1141		}
1142		}
1143
1079	–	ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1144		System.err.println("------ stacktrace dump start ------");
1145	<	for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1146	<	final String name = info.getThreadName();
1147	<	String lockName;
1084	<	if ("Signal Dispatcher".equals(name))
1085	<	continue;
1086	<	if ("Reference Handler".equals(name)
1087	<	&& (lockName = info.getLockName()) != null
1088	<	&& lockName.startsWith("java.lang.ref.Reference$Lock"))
1089	<	continue;
1090	<	if ("Finalizer".equals(name)
1091	<	&& (lockName = info.getLockName()) != null
1092	<	&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1093	<	continue;
1094	<	if ("checkForWedgedTest".equals(name))
1095	<	continue;
1096	<	System.err.print(info);
1097	<	}
1145	>	for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
1146	>	if (threadOfInterest(info))
1147	>	System.err.print(info);
1148		System.err.println("------ stacktrace dump end ------");
1149
1150		if (sm != null) System.setSecurityManager(sm);
#	Line 1121 | Line 1171 | public class JSR166TestCase extends Test
1171		}
1172
1173		/**
1174	+	* Returns the thread's blocker's class name, if any, else null.
1175	+	*/
1176	+	String blockerClassName(Thread thread) {
1177	+	ThreadInfo threadInfo; LockInfo lockInfo;
1178	+	if ((threadInfo = THREAD_MXBEAN.getThreadInfo(thread.getId(), 0)) != null
1179	+	&& (lockInfo = threadInfo.getLockInfo()) != null)
1180	+	return lockInfo.getClassName();
1181	+	return null;
1182	+	}
1183	+
1184	+	/**
1185		* Checks that future.get times out, with the default timeout of
1186		* {@code timeoutMillis()}.
1187		*/
#	Line 1139 | Line 1200 | public class JSR166TestCase extends Test
1200		} catch (TimeoutException success) {
1201		} catch (Exception fail) {
1202		threadUnexpectedException(fail);
1203	<	} finally { future.cancel(true); }
1203	>	}
1204		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1205	+	assertFalse(future.isDone());
1206		}
1207
1208		/**
#	Line 1367 | Line 1429 | public class JSR166TestCase extends Test
1429		}
1430
1431		/**
1432	+	* Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1433	+	* be interrupted.  Clears the interrupt status before returning.
1434	+	*/
1435	+	void awaitInterrupted() {
1436	+	for (long startTime = 0L; !Thread.interrupted(); ) {
1437	+	if (startTime == 0L)
1438	+	startTime = System.nanoTime();
1439	+	else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1440	+	fail("timed out waiting for thread interrupt");
1441	+	Thread.yield();
1442	+	}
1443	+	}
1444	+
1445	+	/**
1446		* Returns the number of milliseconds since time given by
1447		* startNanoTime, which must have been previously returned from a
1448		* call to {@link System#nanoTime()}.
#	Line 1375 | Line 1451 | public class JSR166TestCase extends Test
1451		return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1452		}
1453
1378	–	//     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1379	–	//         long startTime = System.nanoTime();
1380	–	//         try {
1381	–	//             r.run();
1382	–	//         } catch (Throwable fail) { threadUnexpectedException(fail); }
1383	–	//         if (millisElapsedSince(startTime) > timeoutMillis/2)
1384	–	//             throw new AssertionError("did not return promptly");
1385	–	//     }
1386	–
1387	–	//     void assertTerminatesPromptly(Runnable r) {
1388	–	//         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1389	–	//     }
1390	–
1454		/**
1455		* Checks that timed f.get() returns the expected value, and does not
1456		* wait for the timeout to elapse before returning.
#	Line 1418 | Line 1481 | public class JSR166TestCase extends Test
1481		}
1482
1483		/**
1484	+	* Returns a new started daemon Thread running the given action,
1485	+	* wrapped in a CheckedRunnable.
1486	+	*/
1487	+	Thread newStartedThread(Action action) {
1488	+	return newStartedThread(checkedRunnable(action));
1489	+	}
1490	+
1491	+	/**
1492		* Waits for the specified time (in milliseconds) for the thread
1493		* to terminate (using {@link Thread#join(long)}), else interrupts
1494		* the thread (in the hope that it may terminate later) and fails.
1495		*/
1496	<	void awaitTermination(Thread t, long timeoutMillis) {
1496	>	void awaitTermination(Thread thread, long timeoutMillis) {
1497		try {
1498	<	t.join(timeoutMillis);
1498	>	thread.join(timeoutMillis);
1499		} catch (InterruptedException fail) {
1500		threadUnexpectedException(fail);
1501	<	} finally {
1502	<	if (t.getState() != Thread.State.TERMINATED) {
1503	<	t.interrupt();
1504	<	threadFail("timed out waiting for thread to terminate");
1501	>	}
1502	>	if (thread.getState() != Thread.State.TERMINATED) {
1503	>	String detail = String.format(
1504	>	"timed out waiting for thread to terminate, thread=%s, state=%s" ,
1505	>	thread, thread.getState());
1506	>	try {
1507	>	threadFail(detail);
1508	>	} finally {
1509	>	// Interrupt thread __after__ having reported its stack trace
1510	>	thread.interrupt();
1511		}
1512		}
1513		}
#	Line 1458 | Line 1535 | public class JSR166TestCase extends Test
1535		}
1536		}
1537
1538	+	Runnable checkedRunnable(Action action) {
1539	+	return new CheckedRunnable() {
1540	+	public void realRun() throws Throwable {
1541	+	action.run();
1542	+	}};
1543	+	}
1544	+
1545		public abstract class ThreadShouldThrow extends Thread {
1546		protected abstract void realRun() throws Throwable;
1547
#	Line 1696 | Line 1780 | public class JSR166TestCase extends Test
1780
1781		public int await() {
1782		try {
1783	<	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1783	>	return super.await(LONGER_DELAY_MS, MILLISECONDS);
1784		} catch (TimeoutException timedOut) {
1785		throw new AssertionError("timed out");
1786		} catch (Exception fail) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines