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.39 by jsr166, Mon Sep 14 03:27:11 2015 UTC vs.
Revision 1.51 by jsr166, Sun Oct 4 00:59:09 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 699 | Line 699 | public class ThreadPoolExecutorSubclassT
699      }
700  
701      /**
702 <     * shutdownNow returns a list containing tasks that were not run
702 >     * shutdownNow returns a list containing tasks that were not run,
703 >     * and those tasks are drained from the queue
704       */
705 <    public void testShutdownNow() {
706 <        ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
707 <        List l;
708 <        try {
709 <            for (int i = 0; i < 5; i++)
710 <                p.execute(new MediumPossiblyInterruptedRunnable());
711 <        }
712 <        finally {
705 >    public void testShutdownNow() throws InterruptedException {
706 >        final int poolSize = 2;
707 >        final int count = 5;
708 >        final AtomicInteger ran = new AtomicInteger(0);
709 >        ThreadPoolExecutor p =
710 >            new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
711 >                          new ArrayBlockingQueue<Runnable>(10));
712 >        CountDownLatch threadsStarted = new CountDownLatch(poolSize);
713 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
714 >            threadsStarted.countDown();
715              try {
716 <                l = p.shutdownNow();
717 <            } catch (SecurityException ok) { return; }
716 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
717 >            } catch (InterruptedException success) {}
718 >            ran.getAndIncrement();
719 >        }};
720 >        for (int i = 0; i < count; i++)
721 >            p.execute(waiter);
722 >        assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
723 >        assertEquals(poolSize, p.getActiveCount());
724 >        assertEquals(0, p.getCompletedTaskCount());
725 >        final List<Runnable> queuedTasks;
726 >        try {
727 >            queuedTasks = p.shutdownNow();
728 >        } catch (SecurityException ok) {
729 >            return; // Allowed in case test doesn't have privs
730          }
731          assertTrue(p.isShutdown());
732 <        assertTrue(l.size() <= 4);
732 >        assertTrue(p.getQueue().isEmpty());
733 >        assertEquals(count - poolSize, queuedTasks.size());
734 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
735 >        assertTrue(p.isTerminated());
736 >        assertEquals(poolSize, ran.get());
737 >        assertEquals(poolSize, p.getCompletedTaskCount());
738      }
739  
740      // Exception Tests
# Line 1723 | Line 1743 | public class ThreadPoolExecutorSubclassT
1743              l.add(new StringTask());
1744              l.add(new StringTask());
1745              List<Future<String>> futures =
1746 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1746 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1747              assertEquals(2, futures.size());
1748              for (Future<String> future : futures)
1749                  assertSame(TEST_STRING, future.get());
# Line 1853 | Line 1873 | public class ThreadPoolExecutorSubclassT
1873          }
1874      }
1875  
1876 +    /**
1877 +     * get(cancelled task) throws CancellationException
1878 +     * (in part, a test of CustomTPE itself)
1879 +     */
1880 +    public void testGet_cancelled() throws Exception {
1881 +        final ExecutorService e =
1882 +            new CustomTPE(1, 1,
1883 +                          LONG_DELAY_MS, MILLISECONDS,
1884 +                          new LinkedBlockingQueue<Runnable>());
1885 +        try {
1886 +            final CountDownLatch blockerStarted = new CountDownLatch(1);
1887 +            final CountDownLatch done = new CountDownLatch(1);
1888 +            final List<Future<?>> futures = new ArrayList<>();
1889 +            for (int i = 0; i < 2; i++) {
1890 +                Runnable r = new CheckedRunnable() { public void realRun()
1891 +                                                         throws Throwable {
1892 +                    blockerStarted.countDown();
1893 +                    assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1894 +                }};
1895 +                futures.add(e.submit(r));
1896 +            }
1897 +            assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1898 +            for (Future<?> future : futures) future.cancel(false);
1899 +            for (Future<?> future : futures) {
1900 +                try {
1901 +                    future.get();
1902 +                    shouldThrow();
1903 +                } catch (CancellationException success) {}
1904 +                try {
1905 +                    future.get(LONG_DELAY_MS, MILLISECONDS);
1906 +                    shouldThrow();
1907 +                } catch (CancellationException success) {}
1908 +                assertTrue(future.isCancelled());
1909 +                assertTrue(future.isDone());
1910 +            }
1911 +            done.countDown();
1912 +        } finally {
1913 +            joinPool(e);
1914 +        }
1915 +    }
1916 +
1917   }

Diff Legend

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