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.148 by jsr166, Mon Sep 28 08:23:49 2015 UTC vs.
Revision 1.169 by jsr166, Thu Oct 8 21:50:26 2015 UTC

# Line 7 | Line 7
7   */
8  
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.MINUTES;
11   import static java.util.concurrent.TimeUnit.NANOSECONDS;
12  
13   import java.io.ByteArrayInputStream;
# Line 15 | Line 16 | import java.io.ObjectInputStream;
16   import java.io.ObjectOutputStream;
17   import java.lang.management.ManagementFactory;
18   import java.lang.management.ThreadInfo;
19 + import java.lang.management.ThreadMXBean;
20   import java.lang.reflect.Constructor;
21   import java.lang.reflect.Method;
22   import java.lang.reflect.Modifier;
# Line 186 | Line 188 | public class JSR166TestCase extends Test
188          return (regex == null) ? null : Pattern.compile(regex);
189      }
190  
191 +    static volatile TestCase currentTestCase;
192 +    static {
193 +        Runnable checkForWedgedTest = new Runnable() { public void run() {
194 +            // avoid spurious reports with enormous runsPerTest
195 +            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
196 +            for (TestCase lastTestCase = currentTestCase;;) {
197 +                try { MINUTES.sleep(timeoutMinutes); }
198 +                catch (InterruptedException unexpected) { break; }
199 +                if (lastTestCase == currentTestCase) {
200 +                    System.err.println
201 +                        ("Looks like we're stuck running test: "
202 +                         + lastTestCase);
203 +                    System.err.println("availableProcessors=" +
204 +                        Runtime.getRuntime().availableProcessors());
205 +                    dumpTestThreads();
206 +                    // one stack dump is probably enough; more would be spam
207 +                    break;
208 +                }
209 +                lastTestCase = currentTestCase;
210 +            }}};
211 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
212 +        thread.setDaemon(true);
213 +        thread.start();
214 +    }
215 +
216      public void runBare() throws Throwable {
217 +        currentTestCase = this;
218          if (methodFilter == null
219              || methodFilter.matcher(toString()).find())
220              super.runBare();
# Line 460 | Line 488 | public class JSR166TestCase extends Test
488          } else {
489              return new TestSuite();
490          }
463 –
491      }
492  
493      // Delays for timing-dependent tests, in milliseconds.
# Line 518 | Line 545 | public class JSR166TestCase extends Test
545       * the same test have no effect.
546       */
547      public void threadRecordFailure(Throwable t) {
548 +        System.err.println(t);
549 +        dumpTestThreads();
550          threadFailure.compareAndSet(null, t);
551      }
552  
# Line 528 | Line 557 | public class JSR166TestCase extends Test
557      void tearDownFail(String format, Object... args) {
558          String msg = toString() + ": " + String.format(format, args);
559          System.err.println(msg);
560 <        printAllStackTraces();
560 >        dumpTestThreads();
561          throw new AssertionFailedError(msg);
562      }
563  
# Line 565 | Line 594 | public class JSR166TestCase extends Test
594      }
595  
596      /**
597 <     * Finds missing try { ... } finally { joinPool(e); }
597 >     * Finds missing PoolCleaners
598       */
599      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
600          Thread[] survivors = new Thread[7];
# Line 597 | Line 626 | public class JSR166TestCase extends Test
626              fail(reason);
627          } catch (AssertionFailedError t) {
628              threadRecordFailure(t);
629 <            fail(reason);
629 >            throw t;
630          }
631      }
632  
# Line 724 | Line 753 | public class JSR166TestCase extends Test
753      /**
754       * Delays, via Thread.sleep, for the given millisecond delay, but
755       * if the sleep is shorter than specified, may re-sleep or yield
756 <     * until time elapses.
756 >     * until time elapses.  Ensures that the given time, as measured
757 >     * by System.nanoTime(), has elapsed.
758       */
759      static void delay(long millis) throws InterruptedException {
760 <        long startTime = System.nanoTime();
761 <        long ns = millis * 1000 * 1000;
762 <        for (;;) {
760 >        long nanos = millis * (1000 * 1000);
761 >        final long wakeupTime = System.nanoTime() + nanos;
762 >        do {
763              if (millis > 0L)
764                  Thread.sleep(millis);
765              else // too short to sleep
766                  Thread.yield();
767 <            long d = ns - (System.nanoTime() - startTime);
768 <            if (d > 0L)
769 <                millis = d / (1000 * 1000);
770 <            else
771 <                break;
767 >            nanos = wakeupTime - System.nanoTime();
768 >            millis = nanos / (1000 * 1000);
769 >        } while (nanos >= 0L);
770 >    }
771 >
772 >    /**
773 >     * Allows use of try-with-resources with per-test thread pools.
774 >     */
775 >    class PoolCleaner implements AutoCloseable {
776 >        private final ExecutorService pool;
777 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
778 >        public void close() { joinPool(pool); }
779 >    }
780 >
781 >    /**
782 >     * An extension of PoolCleaner that has an action to release the pool.
783 >     */
784 >    class PoolCleanerWithReleaser extends PoolCleaner {
785 >        private final Runnable releaser;
786 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
787 >            super(pool);
788 >            this.releaser = releaser;
789          }
790 +        public void close() {
791 +            try {
792 +                releaser.run();
793 +            } finally {
794 +                super.close();
795 +            }
796 +        }
797 +    }
798 +
799 +    PoolCleaner cleaner(ExecutorService pool) {
800 +        return new PoolCleaner(pool);
801 +    }
802 +
803 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
804 +        return new PoolCleanerWithReleaser(pool, releaser);
805 +    }
806 +
807 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
808 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
809 +    }
810 +
811 +    Runnable releaser(final CountDownLatch latch) {
812 +        return new Runnable() { public void run() {
813 +            do { latch.countDown(); }
814 +            while (latch.getCount() > 0);
815 +        }};
816      }
817  
818      /**
# Line 748 | Line 821 | public class JSR166TestCase extends Test
821      void joinPool(ExecutorService pool) {
822          try {
823              pool.shutdown();
824 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
825 <                fail("ExecutorService " + pool +
826 <                     " did not terminate in a timely manner");
824 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
825 >                try {
826 >                    threadFail("ExecutorService " + pool +
827 >                               " did not terminate in a timely manner");
828 >                } finally {
829 >                    // last resort, for the benefit of subsequent tests
830 >                    pool.shutdownNow();
831 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
832 >                }
833 >            }
834          } catch (SecurityException ok) {
835              // Allowed in case test doesn't have privs
836          } catch (InterruptedException fail) {
837 <            fail("Unexpected InterruptedException");
837 >            threadFail("Unexpected InterruptedException");
838          }
839      }
840  
# Line 768 | Line 848 | public class JSR166TestCase extends Test
848       */
849      void testInParallel(Action ... actions) {
850          ExecutorService pool = Executors.newCachedThreadPool();
851 <        try {
851 >        try (PoolCleaner cleaner = cleaner(pool)) {
852              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
853              for (final Action action : actions)
854                  futures.add(pool.submit(new CheckedRunnable() {
# Line 781 | Line 861 | public class JSR166TestCase extends Test
861                  } catch (Exception ex) {
862                      threadUnexpectedException(ex);
863                  }
784 –        } finally {
785 –            joinPool(pool);
864          }
865      }
866  
867      /**
868 <     * A debugging tool to print all stack traces, as jstack does.
868 >     * A debugging tool to print stack traces of most threads, as jstack does.
869 >     * Uninteresting threads are filtered out.
870       */
871 <    static void printAllStackTraces() {
872 <        for (ThreadInfo info :
873 <                 ManagementFactory.getThreadMXBean()
874 <                 .dumpAllThreads(true, true))
871 >    static void dumpTestThreads() {
872 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
873 >        System.err.println("------ stacktrace dump start ------");
874 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
875 >            String name = info.getThreadName();
876 >            if ("Signal Dispatcher".equals(name))
877 >                continue;
878 >            if ("Reference Handler".equals(name)
879 >                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
880 >                continue;
881 >            if ("Finalizer".equals(name)
882 >                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
883 >                continue;
884 >            if ("checkForWedgedTest".equals(name))
885 >                continue;
886              System.err.print(info);
887 +        }
888 +        System.err.println("------ stacktrace dump end ------");
889      }
890  
891      /**
# Line 813 | Line 905 | public class JSR166TestCase extends Test
905              delay(millis);
906              assertTrue(thread.isAlive());
907          } catch (InterruptedException fail) {
908 <            fail("Unexpected InterruptedException");
908 >            threadFail("Unexpected InterruptedException");
909          }
910      }
911  
# Line 835 | Line 927 | public class JSR166TestCase extends Test
927              for (Thread thread : threads)
928                  assertTrue(thread.isAlive());
929          } catch (InterruptedException fail) {
930 <            fail("Unexpected InterruptedException");
930 >            threadFail("Unexpected InterruptedException");
931          }
932      }
933  
# Line 1113 | Line 1205 | public class JSR166TestCase extends Test
1205          } finally {
1206              if (t.getState() != Thread.State.TERMINATED) {
1207                  t.interrupt();
1208 <                fail("Test timed out");
1208 >                threadFail("Test timed out");
1209              }
1210          }
1211      }
# Line 1261 | Line 1353 | public class JSR166TestCase extends Test
1353              }};
1354      }
1355  
1356 <    public Runnable awaiter(final CountDownLatch latch) {
1357 <        return new CheckedRunnable() {
1358 <            public void realRun() throws InterruptedException {
1359 <                await(latch);
1360 <            }};
1356 >    class LatchAwaiter extends CheckedRunnable {
1357 >        static final int NEW = 0;
1358 >        static final int RUNNING = 1;
1359 >        static final int DONE = 2;
1360 >        final CountDownLatch latch;
1361 >        int state = NEW;
1362 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1363 >        public void realRun() throws InterruptedException {
1364 >            state = 1;
1365 >            await(latch);
1366 >            state = 2;
1367 >        }
1368 >    }
1369 >
1370 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1371 >        return new LatchAwaiter(latch);
1372      }
1373  
1374      public void await(CountDownLatch latch) {

Diff Legend

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