ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.40 by jsr166, Sun Sep 27 18:50:50 2015 UTC vs.
Revision 1.52 by jsr166, Sun Oct 4 01:18:25 2015 UTC

# Line 30 | 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 100 | 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 113 | 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 124 | Line 129 | public class ThreadPoolExecutorSubclassT
129              long nanos = unit.toNanos(timeout);
130              lock.lock();
131              try {
132 <                for (;;) {
133 <                    if (done) break;
129 <                    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 226 | 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();
235 <            }};
236 <        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));
239 <        } finally {
240 <            joinPool(p);
242 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243          }
244      }
245  
# Line 252 | 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 262 | Line 264 | public class ThreadPoolExecutorSubclassT
264                  }});
265              assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266              assertEquals(1, p.getActiveCount());
265 –        } finally {
267              done.countDown();
267 –            joinPool(p);
268          }
269      }
270  
# Line 272 | 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 702 | Line 713 | public class ThreadPoolExecutorSubclassT
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(p.getQueue().isEmpty());
744 <        assertTrue(l.size() <= 4);
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 1725 | 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 1855 | Line 1884 | public class ThreadPoolExecutorSubclassT
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