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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.156 by jsr166, Sat Oct 3 21:09:42 2015 UTC vs.
Revision 1.170 by jsr166, Thu Oct 8 22:39:57 2015 UTC

# Line 188 | Line 188 | public class JSR166TestCase extends Test
188          return (regex == null) ? null : Pattern.compile(regex);
189      }
190  
191 +    // Instrumentation to debug very rare, but very annoying hung test runs.
192      static volatile TestCase currentTestCase;
193 +    static volatile int currentRun = 0;
194      static {
195          Runnable checkForWedgedTest = new Runnable() { public void run() {
196 +            // avoid spurious reports with enormous runsPerTest
197 +            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
198              for (TestCase lastTestCase = currentTestCase;;) {
199 <                try { MINUTES.sleep(10); }
199 >                try { MINUTES.sleep(timeoutMinutes); }
200                  catch (InterruptedException unexpected) { break; }
201                  if (lastTestCase == currentTestCase) {
202 +                    System.err.printf(
203 +                        "Looks like we're stuck running test: %s (%d/%d)%n",
204 +                        lastTestCase, currentRun, runsPerTest);
205                      System.err.println
206                          ("Looks like we're stuck running test: "
207 <                         + lastTestCase);
207 >                         + lastTestCase + " (" + currentRun + "/" + runsPerTest + ")");
208 >                    System.err.println("availableProcessors=" +
209 >                        Runtime.getRuntime().availableProcessors());
210                      dumpTestThreads();
211 +                    // one stack dump is probably enough; more would be spam
212 +                    break;
213                  }
214                  lastTestCase = currentTestCase;
215              }}};
# Line 216 | Line 227 | public class JSR166TestCase extends Test
227  
228      protected void runTest() throws Throwable {
229          for (int i = 0; i < runsPerTest; i++) {
230 +            currentRun = i;
231              if (profileTests)
232                  runTestProfiled();
233              else
# Line 539 | Line 551 | public class JSR166TestCase extends Test
551       * the same test have no effect.
552       */
553      public void threadRecordFailure(Throwable t) {
554 +        System.err.println(t);
555          dumpTestThreads();
556          threadFailure.compareAndSet(null, t);
557      }
# Line 587 | Line 600 | public class JSR166TestCase extends Test
600      }
601  
602      /**
603 <     * Finds missing try { ... } finally { joinPool(e); }
603 >     * Finds missing PoolCleaners
604       */
605      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
606          Thread[] survivors = new Thread[7];
# Line 746 | Line 759 | public class JSR166TestCase extends Test
759      /**
760       * Delays, via Thread.sleep, for the given millisecond delay, but
761       * if the sleep is shorter than specified, may re-sleep or yield
762 <     * until time elapses.
762 >     * until time elapses.  Ensures that the given time, as measured
763 >     * by System.nanoTime(), has elapsed.
764       */
765      static void delay(long millis) throws InterruptedException {
766 <        long startTime = System.nanoTime();
767 <        long ns = millis * 1000 * 1000;
768 <        for (;;) {
766 >        long nanos = millis * (1000 * 1000);
767 >        final long wakeupTime = System.nanoTime() + nanos;
768 >        do {
769              if (millis > 0L)
770                  Thread.sleep(millis);
771              else // too short to sleep
772                  Thread.yield();
773 <            long d = ns - (System.nanoTime() - startTime);
774 <            if (d > 0L)
775 <                millis = d / (1000 * 1000);
762 <            else
763 <                break;
764 <        }
773 >            nanos = wakeupTime - System.nanoTime();
774 >            millis = nanos / (1000 * 1000);
775 >        } while (nanos >= 0L);
776      }
777  
778      /**
779       * Allows use of try-with-resources with per-test thread pools.
780       */
781 <    static class PoolCloser<T extends ExecutorService>
782 <            implements AutoCloseable {
783 <        public final T pool;
773 <        public PoolCloser(T pool) { this.pool = pool; }
781 >    class PoolCleaner implements AutoCloseable {
782 >        private final ExecutorService pool;
783 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
784          public void close() { joinPool(pool); }
785      }
786  
787      /**
788 +     * An extension of PoolCleaner that has an action to release the pool.
789 +     */
790 +    class PoolCleanerWithReleaser extends PoolCleaner {
791 +        private final Runnable releaser;
792 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
793 +            super(pool);
794 +            this.releaser = releaser;
795 +        }
796 +        public void close() {
797 +            try {
798 +                releaser.run();
799 +            } finally {
800 +                super.close();
801 +            }
802 +        }
803 +    }
804 +
805 +    PoolCleaner cleaner(ExecutorService pool) {
806 +        return new PoolCleaner(pool);
807 +    }
808 +
809 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
810 +        return new PoolCleanerWithReleaser(pool, releaser);
811 +    }
812 +
813 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
814 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
815 +    }
816 +
817 +    Runnable releaser(final CountDownLatch latch) {
818 +        return new Runnable() { public void run() {
819 +            do { latch.countDown(); }
820 +            while (latch.getCount() > 0);
821 +        }};
822 +    }
823 +
824 +    /**
825       * Waits out termination of a thread pool or fails doing so.
826       */
827 <    static void joinPool(ExecutorService pool) {
827 >    void joinPool(ExecutorService pool) {
828          try {
829              pool.shutdown();
830 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
831 <                fail("ExecutorService " + pool +
832 <                     " did not terminate in a timely manner");
830 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
831 >                try {
832 >                    threadFail("ExecutorService " + pool +
833 >                               " did not terminate in a timely manner");
834 >                } finally {
835 >                    // last resort, for the benefit of subsequent tests
836 >                    pool.shutdownNow();
837 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
838 >                }
839 >            }
840          } catch (SecurityException ok) {
841              // Allowed in case test doesn't have privs
842          } catch (InterruptedException fail) {
843 <            fail("Unexpected InterruptedException");
843 >            threadFail("Unexpected InterruptedException");
844          }
845      }
846  
# Line 799 | Line 853 | public class JSR166TestCase extends Test
853       * necessarily individually slow because they must block.
854       */
855      void testInParallel(Action ... actions) {
856 <        try (PoolCloser<ExecutorService> poolCloser
857 <             = new PoolCloser<>(Executors.newCachedThreadPool())) {
804 <            ExecutorService pool = poolCloser.pool;
856 >        ExecutorService pool = Executors.newCachedThreadPool();
857 >        try (PoolCleaner cleaner = cleaner(pool)) {
858              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
859              for (final Action action : actions)
860                  futures.add(pool.submit(new CheckedRunnable() {
# Line 858 | Line 911 | public class JSR166TestCase extends Test
911              delay(millis);
912              assertTrue(thread.isAlive());
913          } catch (InterruptedException fail) {
914 <            fail("Unexpected InterruptedException");
914 >            threadFail("Unexpected InterruptedException");
915          }
916      }
917  
# Line 880 | Line 933 | public class JSR166TestCase extends Test
933              for (Thread thread : threads)
934                  assertTrue(thread.isAlive());
935          } catch (InterruptedException fail) {
936 <            fail("Unexpected InterruptedException");
936 >            threadFail("Unexpected InterruptedException");
937          }
938      }
939  
# Line 1158 | Line 1211 | public class JSR166TestCase extends Test
1211          } finally {
1212              if (t.getState() != Thread.State.TERMINATED) {
1213                  t.interrupt();
1214 <                fail("Test timed out");
1214 >                threadFail("Test timed out");
1215              }
1216          }
1217      }
# Line 1306 | Line 1359 | public class JSR166TestCase extends Test
1359              }};
1360      }
1361  
1362 <    public Runnable awaiter(final CountDownLatch latch) {
1363 <        return new CheckedRunnable() {
1364 <            public void realRun() throws InterruptedException {
1365 <                await(latch);
1366 <            }};
1362 >    class LatchAwaiter extends CheckedRunnable {
1363 >        static final int NEW = 0;
1364 >        static final int RUNNING = 1;
1365 >        static final int DONE = 2;
1366 >        final CountDownLatch latch;
1367 >        int state = NEW;
1368 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1369 >        public void realRun() throws InterruptedException {
1370 >            state = 1;
1371 >            await(latch);
1372 >            state = 2;
1373 >        }
1374 >    }
1375 >
1376 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1377 >        return new LatchAwaiter(latch);
1378      }
1379  
1380      public void await(CountDownLatch latch) {

Diff Legend

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