ViewVC Help

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

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

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.36 by jsr166, Fri May 15 17:07:27 2015 UTC vs.
Revision 1.52 by jsr166, Sun Oct 4 01:18:25 2015 UTC

#	Line 14 | Line 14 | import java.util.List;
14		import java.util.concurrent.ArrayBlockingQueue;
15		import java.util.concurrent.BlockingQueue;
16		import java.util.concurrent.Callable;
17	+	import java.util.concurrent.CancellationException;
18		import java.util.concurrent.CountDownLatch;
19		import java.util.concurrent.ExecutionException;
20		import java.util.concurrent.Executors;
#	Line 29 | Line 30 | import java.util.concurrent.ThreadFactor
30		import java.util.concurrent.ThreadPoolExecutor;
31		import java.util.concurrent.TimeoutException;
32		import java.util.concurrent.TimeUnit;
33	+	import java.util.concurrent.atomic.AtomicInteger;
34		import java.util.concurrent.locks.Condition;
35		import java.util.concurrent.locks.ReentrantLock;
36
#	Line 99 | Line 101 | public class ThreadPoolExecutorSubclassT
101		}
102		lock.lock();
103		try {
104	<	result = v;
105	<	exception = e;
106	<	done = true;
107	<	thread = null;
108	<	cond.signalAll();
104	>	if (!done) {
105	>	result = v;
106	>	exception = e;
107	>	done = true;
108	>	thread = null;
109	>	cond.signalAll();
110	>	}
111		}
112		finally { lock.unlock(); }
113		}
#	Line 112 | Line 116 | public class ThreadPoolExecutorSubclassT
116		try {
117		while (!done)
118		cond.await();
119	+	if (cancelled)
120	+	throw new CancellationException();
121		if (exception != null)
122		throw new ExecutionException(exception);
123		return result;
#	Line 123 | Line 129 | public class ThreadPoolExecutorSubclassT
129		long nanos = unit.toNanos(timeout);
130		lock.lock();
131		try {
132	<	for (;;) {
133	<	if (done) break;
128	<	if (nanos < 0)
132	>	while (!done) {
133	>	if (nanos <= 0L)
134		throw new TimeoutException();
135		nanos = cond.awaitNanos(nanos);
136		}
137	+	if (cancelled)
138	+	throw new CancellationException();
139		if (exception != null)
140		throw new ExecutionException(exception);
141		return result;
#	Line 225 | Line 232 | public class ThreadPoolExecutorSubclassT
232		public void testExecute() throws InterruptedException {
233		final ThreadPoolExecutor p =
234		new CustomTPE(1, 1,
235	<	LONG_DELAY_MS, MILLISECONDS,
235	>	2 * LONG_DELAY_MS, MILLISECONDS,
236		new ArrayBlockingQueue<Runnable>(10));
237	<	final CountDownLatch done = new CountDownLatch(1);
238	<	final Runnable task = new CheckedRunnable() {
239	<	public void realRun() {
240	<	done.countDown();
234	<	}};
235	<	try {
237	>	try (PoolCleaner cleaner = cleaner(p)) {
238	>	final CountDownLatch done = new CountDownLatch(1);
239	>	final Runnable task = new CheckedRunnable() {
240	>	public void realRun() { done.countDown(); }};
241		p.execute(task);
242	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
238	<	} finally {
239	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 251 | Line 254 | public class ThreadPoolExecutorSubclassT
254		new ArrayBlockingQueue<Runnable>(10));
255		final CountDownLatch threadStarted = new CountDownLatch(1);
256		final CountDownLatch done = new CountDownLatch(1);
257	<	try {
257	>	try (PoolCleaner cleaner = cleaner(p)) {
258		assertEquals(0, p.getActiveCount());
259		p.execute(new CheckedRunnable() {
260		public void realRun() throws InterruptedException {
#	Line 261 | Line 264 | public class ThreadPoolExecutorSubclassT
264		}});
265		assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
264	–	} finally {
267		done.countDown();
266	–	joinPool(p);
268		}
269		}
270
#	Line 271 | Line 272 | public class ThreadPoolExecutorSubclassT
272		* prestartCoreThread starts a thread if under corePoolSize, else doesn't
273		*/
274		public void testPrestartCoreThread() {
275	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276	<	assertEquals(0, p.getPoolSize());
277	<	assertTrue(p.prestartCoreThread());
278	<	assertEquals(1, p.getPoolSize());
279	<	assertTrue(p.prestartCoreThread());
280	<	assertEquals(2, p.getPoolSize());
281	<	assertFalse(p.prestartCoreThread());
282	<	assertEquals(2, p.getPoolSize());
283	<	joinPool(p);
275	>	ThreadPoolExecutor p =
276	>	new CustomTPE(2, 6,
277	>	LONG_DELAY_MS, MILLISECONDS,
278	>	new ArrayBlockingQueue<Runnable>(10));
279	>	try (PoolCleaner cleaner = cleaner(p)) {
280	>	assertEquals(0, p.getPoolSize());
281	>	assertTrue(p.prestartCoreThread());
282	>	assertEquals(1, p.getPoolSize());
283	>	assertTrue(p.prestartCoreThread());
284	>	assertEquals(2, p.getPoolSize());
285	>	assertFalse(p.prestartCoreThread());
286	>	assertEquals(2, p.getPoolSize());
287	>	p.setCorePoolSize(4);
288	>	assertTrue(p.prestartCoreThread());
289	>	assertEquals(3, p.getPoolSize());
290	>	assertTrue(p.prestartCoreThread());
291	>	assertEquals(4, p.getPoolSize());
292	>	assertFalse(p.prestartCoreThread());
293	>	assertEquals(4, p.getPoolSize());
294	>	}
295		}
296
297		/**
#	Line 345 | Line 357 | public class ThreadPoolExecutorSubclassT
357		*/
358		public void testGetKeepAliveTime() {
359		ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
360	<	assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
360	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
361		joinPool(p);
362		}
363
#	Line 698 | Line 710 | public class ThreadPoolExecutorSubclassT
710		}
711
712		/**
713	<	* shutdownNow returns a list containing tasks that were not run
713	>	* shutdownNow returns a list containing tasks that were not run,
714	>	* and those tasks are drained from the queue
715		*/
716	<	public void testShutdownNow() {
717	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
718	<	List l;
719	<	try {
720	<	for (int i = 0; i < 5; i++)
721	<	p.execute(new MediumPossiblyInterruptedRunnable());
722	<	}
723	<	finally {
716	>	public void testShutdownNow() throws InterruptedException {
717	>	final int poolSize = 2;
718	>	final int count = 5;
719	>	final AtomicInteger ran = new AtomicInteger(0);
720	>	ThreadPoolExecutor p =
721	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
722	>	new ArrayBlockingQueue<Runnable>(10));
723	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
724	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
725	>	threadsStarted.countDown();
726		try {
727	<	l = p.shutdownNow();
728	<	} catch (SecurityException ok) { return; }
727	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
728	>	} catch (InterruptedException success) {}
729	>	ran.getAndIncrement();
730	>	}};
731	>	for (int i = 0; i < count; i++)
732	>	p.execute(waiter);
733	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
734	>	assertEquals(poolSize, p.getActiveCount());
735	>	assertEquals(0, p.getCompletedTaskCount());
736	>	final List<Runnable> queuedTasks;
737	>	try {
738	>	queuedTasks = p.shutdownNow();
739	>	} catch (SecurityException ok) {
740	>	return; // Allowed in case test doesn't have privs
741		}
742		assertTrue(p.isShutdown());
743	<	assertTrue(l.size() <= 4);
743	>	assertTrue(p.getQueue().isEmpty());
744	>	assertEquals(count - poolSize, queuedTasks.size());
745	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
746	>	assertTrue(p.isTerminated());
747	>	assertEquals(poolSize, ran.get());
748	>	assertEquals(poolSize, p.getCompletedTaskCount());
749		}
750
751		// Exception Tests
#	Line 1223 | Line 1255 | public class ThreadPoolExecutorSubclassT
1255		* execute(null) throws NPE
1256		*/
1257		public void testExecuteNull() {
1258	<	ThreadPoolExecutor p = null;
1258	>	ThreadPoolExecutor p =
1259	>	new CustomTPE(1, 2, 1L, SECONDS,
1260	>	new ArrayBlockingQueue<Runnable>(10));
1261		try {
1228	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1262		p.execute(null);
1263		shouldThrow();
1264		} catch (NullPointerException success) {}
#	Line 1721 | Line 1754 | public class ThreadPoolExecutorSubclassT
1754		l.add(new StringTask());
1755		l.add(new StringTask());
1756		List<Future<String>> futures =
1757	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1757	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1758		assertEquals(2, futures.size());
1759		for (Future<String> future : futures)
1760		assertSame(TEST_STRING, future.get());
#	Line 1736 | Line 1769 | public class ThreadPoolExecutorSubclassT
1769		public void testTimedInvokeAll6() throws Exception {
1770		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1771		try {
1772	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1773	<	l.add(new StringTask());
1774	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1775	<	l.add(new StringTask());
1776	<	List<Future<String>> futures =
1777	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1778	<	assertEquals(l.size(), futures.size());
1779	<	for (Future future : futures)
1780	<	assertTrue(future.isDone());
1781	<	assertFalse(futures.get(0).isCancelled());
1782	<	assertTrue(futures.get(1).isCancelled());
1772	>	for (long timeout = timeoutMillis();;) {
1773	>	List<Callable<String>> tasks = new ArrayList<>();
1774	>	tasks.add(new StringTask("0"));
1775	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1776	>	tasks.add(new StringTask("2"));
1777	>	long startTime = System.nanoTime();
1778	>	List<Future<String>> futures =
1779	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1780	>	assertEquals(tasks.size(), futures.size());
1781	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1782	>	for (Future future : futures)
1783	>	assertTrue(future.isDone());
1784	>	assertTrue(futures.get(1).isCancelled());
1785	>	try {
1786	>	assertEquals("0", futures.get(0).get());
1787	>	assertEquals("2", futures.get(2).get());
1788	>	break;
1789	>	} catch (CancellationException retryWithLongerTimeout) {
1790	>	timeout *= 2;
1791	>	if (timeout >= LONG_DELAY_MS / 2)
1792	>	fail("expected exactly one task to be cancelled");
1793	>	}
1794	>	}
1795		} finally {
1796		joinPool(e);
1797		}
#	Line 1789 | Line 1834 | public class ThreadPoolExecutorSubclassT
1834		* allowCoreThreadTimeOut(true) causes idle threads to time out
1835		*/
1836		public void testAllowCoreThreadTimeOut_true() throws Exception {
1837	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1837	>	long keepAliveTime = timeoutMillis();
1838		final ThreadPoolExecutor p =
1839		new CustomTPE(2, 10,
1840	<	coreThreadTimeOut, MILLISECONDS,
1840	>	keepAliveTime, MILLISECONDS,
1841		new ArrayBlockingQueue<Runnable>(10));
1842		final CountDownLatch threadStarted = new CountDownLatch(1);
1843		try {
1844		p.allowCoreThreadTimeOut(true);
1845		p.execute(new CheckedRunnable() {
1846	<	public void realRun() throws InterruptedException {
1846	>	public void realRun() {
1847		threadStarted.countDown();
1848		assertEquals(1, p.getPoolSize());
1849		}});
1850		await(threadStarted);
1851	<	delay(coreThreadTimeOut);
1851	>	delay(keepAliveTime);
1852		long startTime = System.nanoTime();
1853		while (p.getPoolSize() > 0
1854		&& millisElapsedSince(startTime) < LONG_DELAY_MS)
#	Line 1819 | Line 1864 | public class ThreadPoolExecutorSubclassT
1864		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1865		*/
1866		public void testAllowCoreThreadTimeOut_false() throws Exception {
1867	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1867	>	long keepAliveTime = timeoutMillis();
1868		final ThreadPoolExecutor p =
1869		new CustomTPE(2, 10,
1870	<	coreThreadTimeOut, MILLISECONDS,
1870	>	keepAliveTime, MILLISECONDS,
1871		new ArrayBlockingQueue<Runnable>(10));
1872		final CountDownLatch threadStarted = new CountDownLatch(1);
1873		try {
#	Line 1832 | Line 1877 | public class ThreadPoolExecutorSubclassT
1877		threadStarted.countDown();
1878		assertTrue(p.getPoolSize() >= 1);
1879		}});
1880	<	delay(2 * coreThreadTimeOut);
1880	>	delay(2 * keepAliveTime);
1881		assertTrue(p.getPoolSize() >= 1);
1882		} finally {
1883		joinPool(p);
1884		}
1885		}
1886
1887	+	/**
1888	+	* get(cancelled task) throws CancellationException
1889	+	* (in part, a test of CustomTPE itself)
1890	+	*/
1891	+	public void testGet_cancelled() throws Exception {
1892	+	final ExecutorService e =
1893	+	new CustomTPE(1, 1,
1894	+	LONG_DELAY_MS, MILLISECONDS,
1895	+	new LinkedBlockingQueue<Runnable>());
1896	+	try {
1897	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1898	+	final CountDownLatch done = new CountDownLatch(1);
1899	+	final List<Future<?>> futures = new ArrayList<>();
1900	+	for (int i = 0; i < 2; i++) {
1901	+	Runnable r = new CheckedRunnable() { public void realRun()
1902	+	throws Throwable {
1903	+	blockerStarted.countDown();
1904	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1905	+	}};
1906	+	futures.add(e.submit(r));
1907	+	}
1908	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1909	+	for (Future<?> future : futures) future.cancel(false);
1910	+	for (Future<?> future : futures) {
1911	+	try {
1912	+	future.get();
1913	+	shouldThrow();
1914	+	} catch (CancellationException success) {}
1915	+	try {
1916	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1917	+	shouldThrow();
1918	+	} catch (CancellationException success) {}
1919	+	assertTrue(future.isCancelled());
1920	+	assertTrue(future.isDone());
1921	+	}
1922	+	done.countDown();
1923	+	} finally {
1924	+	joinPool(e);
1925	+	}
1926	+	}
1927	+
1928		}

Diff Legend

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