ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinPool8Test.java (file contents):
Revision 1.15 by dl, Sun Sep 15 22:35:46 2013 UTC vs.
Revision 1.22 by jsr166, Tue Sep 17 02:17:11 2013 UTC

#	Line 1485 | Line 1485 | public class ForkJoinPool8Test extends J
1485		}
1486
1487		/**
1488	<	* awaitQuiescent by a worker is equivalent in effect to
1488	>	* awaitQuiescence by a worker is equivalent in effect to
1489		* ForkJoinTask.helpQuiesce()
1490		*/
1491	<	public void testAwaitQuiescent1() throws Exception {
1491	>	public void testAwaitQuiescence1() throws Exception {
1492		final ForkJoinPool p = new ForkJoinPool();
1493		try {
1494		final long startTime = System.nanoTime();
1495		assertTrue(p.isQuiescent());
1496		ForkJoinTask a = new CheckedRecursiveAction() {
1497	<	protected void realCompute() {
1498	<	FibAction f = new FibAction(8);
1499	<	assertSame(f, f.fork());
1500	<	boolean t = ForkJoinTask.getPool().awaitQuiescence(MEDIUM_DELAY_MS, TimeUnit.SECONDS);
1501	<	assertTrue(t);
1502	<	while (!f.isDone()) {
1503	<	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1504	<	threadFail("timed out");
1505	<	assertFalse(p.getAsyncMode());
1506	<	assertFalse(p.isShutdown());
1507	<	assertFalse(p.isTerminating());
1508	<	assertFalse(p.isTerminated());
1509	<	Thread.yield();
1510	<	}
1511	<	assertFalse(p.isQuiescent());
1512	<	assertEquals(0, ForkJoinTask.getQueuedTaskCount());
1513	<	try {
1514	<	assertEquals(21, f.result);
1515	<	} catch (Throwable fail) {
1516	<	threadFail(fail.getMessage());
1517	<	}
1497	>	protected void realCompute() {
1498	>	FibAction f = new FibAction(8);
1499	>	assertSame(f, f.fork());
1500	>	assertSame(p, ForkJoinTask.getPool());
1501	>	boolean quiescent = p.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS);
1502	>	assertTrue(quiescent);
1503	>	assertFalse(p.isQuiescent());
1504	>	while (!f.isDone()) {
1505	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1506	>	assertFalse(p.getAsyncMode());
1507	>	assertFalse(p.isShutdown());
1508	>	assertFalse(p.isTerminating());
1509	>	assertFalse(p.isTerminated());
1510	>	Thread.yield();
1511		}
1512	<	};
1512	>	assertFalse(p.isQuiescent());
1513	>	assertEquals(0, ForkJoinTask.getQueuedTaskCount());
1514	>	assertEquals(21, f.result);
1515	>	}};
1516		p.execute(a);
1517		while (!a.isDone() || !p.isQuiescent()) {
1518	<	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1523	<	throw new AssertionFailedError("timed out");
1518	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1519		assertFalse(p.getAsyncMode());
1520		assertFalse(p.isShutdown());
1521		assertFalse(p.isTerminating());
#	Line 1542 | Line 1537 | public class ForkJoinPool8Test extends J
1537		}
1538
1539		/**
1540	<	* awaitQuiescent returns when pool isQuiescent() or the indicated
1541	<	* timeout elapse
1540	>	* awaitQuiescence returns when pool isQuiescent() or the indicated
1541	>	* timeout elapsed
1542		*/
1543	<	public void testAwaitQuiescent2() throws Exception {
1543	>	public void testAwaitQuiescence2() throws Exception {
1544		final ForkJoinPool p = new ForkJoinPool();
1545		try {
1546		assertTrue(p.isQuiescent());
1547		for (;;) {
1548		final long startTime = System.nanoTime();
1549		ForkJoinTask a = new CheckedRecursiveAction() {
1550	<	protected void realCompute() {
1551	<	FibAction f = new FibAction(8);
1552	<	assertSame(f, f.fork());
1553	<	ForkJoinTask.helpQuiesce();
1554	<	while (!f.isDone()) {
1555	<	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1556	<	threadFail("timed out");
1557	<	assertFalse(p.getAsyncMode());
1558	<	assertFalse(p.isShutdown());
1559	<	assertFalse(p.isTerminating());
1560	<	assertFalse(p.isTerminated());
1566	<	Thread.yield();
1567	<	}
1568	<	assertEquals(0, ForkJoinTask.getQueuedTaskCount());
1569	<	try {
1570	<	assertEquals(21, f.result);
1571	<	} catch (Throwable fail) { System.out.println("fail " + fail.getMessage()); }
1550	>	protected void realCompute() {
1551	>	FibAction f = new FibAction(8);
1552	>	assertSame(f, f.fork());
1553	>	ForkJoinTask.helpQuiesce();
1554	>	while (!f.isDone()) {
1555	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1556	>	assertFalse(p.getAsyncMode());
1557	>	assertFalse(p.isShutdown());
1558	>	assertFalse(p.isTerminating());
1559	>	assertFalse(p.isTerminated());
1560	>	Thread.yield();
1561		}
1562	<	};
1562	>	assertEquals(0, ForkJoinTask.getQueuedTaskCount());
1563	>	assertEquals(21, f.result);
1564	>	}};
1565		p.execute(a);
1566		if (a.isDone() || p.isQuiescent())
1567		continue; // Already done so cannot test; retry
1568		while (!p.awaitQuiescence(LONG_DELAY_MS, MILLISECONDS)) {
1569	<	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1579	<	threadFail("timed out");
1569	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1570		assertFalse(p.getAsyncMode());
1571		assertFalse(p.isShutdown());
1572		assertFalse(p.isTerminating());

Diff Legend

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