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.145 by jsr166, Fri Sep 25 05:41:29 2015 UTC vs.
Revision 1.159 by jsr166, Sun Oct 4 00:30:50 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 40 | Line 42 | import java.util.concurrent.CyclicBarrie
42   import java.util.concurrent.ExecutionException;
43   import java.util.concurrent.Executors;
44   import java.util.concurrent.ExecutorService;
45 + import java.util.concurrent.ForkJoinPool;
46   import java.util.concurrent.Future;
47   import java.util.concurrent.RecursiveAction;
48   import java.util.concurrent.RecursiveTask;
# Line 185 | Line 188 | public class JSR166TestCase extends Test
188          return (regex == null) ? null : Pattern.compile(regex);
189      }
190  
191 <    protected void runTest() throws Throwable {
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 >                    dumpTestThreads();
204 >                }
205 >                lastTestCase = currentTestCase;
206 >            }}};
207 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
208 >        thread.setDaemon(true);
209 >        thread.start();
210 >    }
211 >
212 >    public void runBare() throws Throwable {
213 >        currentTestCase = this;
214          if (methodFilter == null
215 <            || methodFilter.matcher(toString()).find()) {
216 <            for (int i = 0; i < runsPerTest; i++) {
217 <                if (profileTests)
218 <                    runTestProfiled();
219 <                else
220 <                    super.runTest();
221 <            }
215 >            || methodFilter.matcher(toString()).find())
216 >            super.runBare();
217 >    }
218 >
219 >    protected void runTest() throws Throwable {
220 >        for (int i = 0; i < runsPerTest; i++) {
221 >            if (profileTests)
222 >                runTestProfiled();
223 >            else
224 >                super.runTest();
225          }
226      }
227  
# Line 456 | Line 484 | public class JSR166TestCase extends Test
484          } else {
485              return new TestSuite();
486          }
459 –
487      }
488  
489      // Delays for timing-dependent tests, in milliseconds.
# Line 514 | Line 541 | public class JSR166TestCase extends Test
541       * the same test have no effect.
542       */
543      public void threadRecordFailure(Throwable t) {
544 +        System.err.println(t);
545 +        dumpTestThreads();
546          threadFailure.compareAndSet(null, t);
547      }
548  
# Line 521 | Line 550 | public class JSR166TestCase extends Test
550          setDelays();
551      }
552  
553 +    void tearDownFail(String format, Object... args) {
554 +        String msg = toString() + ": " + String.format(format, args);
555 +        System.err.println(msg);
556 +        dumpTestThreads();
557 +        throw new AssertionFailedError(msg);
558 +    }
559 +
560      /**
561       * Extra checks that get done for all test cases.
562       *
# Line 548 | Line 584 | public class JSR166TestCase extends Test
584          }
585  
586          if (Thread.interrupted())
587 <            throw new AssertionFailedError("interrupt status set in main thread");
587 >            tearDownFail("interrupt status set in main thread");
588  
589          checkForkJoinPoolThreadLeaks();
590      }
# Line 557 | Line 593 | public class JSR166TestCase extends Test
593       * Finds missing try { ... } finally { joinPool(e); }
594       */
595      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
596 <        Thread[] survivors = new Thread[5];
596 >        Thread[] survivors = new Thread[7];
597          int count = Thread.enumerate(survivors);
598          for (int i = 0; i < count; i++) {
599              Thread thread = survivors[i];
# Line 565 | Line 601 | public class JSR166TestCase extends Test
601              if (name.startsWith("ForkJoinPool-")) {
602                  // give thread some time to terminate
603                  thread.join(LONG_DELAY_MS);
604 <                if (!thread.isAlive()) continue;
605 <                throw new AssertionFailedError
606 <                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
571 <                                   toString(), name));
604 >                if (thread.isAlive())
605 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
606 >                                 thread);
607              }
608          }
609 +
610 +        if (!ForkJoinPool.commonPool()
611 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
612 +            tearDownFail("ForkJoin common pool thread stuck");
613      }
614  
615      /**
# Line 583 | Line 622 | public class JSR166TestCase extends Test
622              fail(reason);
623          } catch (AssertionFailedError t) {
624              threadRecordFailure(t);
625 <            fail(reason);
625 >            throw t;
626          }
627      }
628  
# Line 729 | Line 768 | public class JSR166TestCase extends Test
768      }
769  
770      /**
771 +     * Allows use of try-with-resources with per-test thread pools.
772 +     */
773 +    class PoolCleaner<T extends ExecutorService>
774 +            implements AutoCloseable {
775 +        public final T pool;
776 +        public PoolCleaner(T pool) { this.pool = pool; }
777 +        public void close() { joinPool(pool); }
778 +    }
779 +
780 +    <T extends ExecutorService> PoolCleaner<T> cleaner(T pool) {
781 +        return new PoolCleaner<T>(pool);
782 +    }
783 +
784 +    /**
785       * Waits out termination of a thread pool or fails doing so.
786       */
787      void joinPool(ExecutorService pool) {
788          try {
789              pool.shutdown();
790 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
791 <                fail("ExecutorService " + pool +
792 <                     " did not terminate in a timely manner");
790 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
791 >                try {
792 >                    threadFail("ExecutorService " + pool +
793 >                               " did not terminate in a timely manner");
794 >                } finally {
795 >                    // last resort, for the benefit of subsequent tests
796 >                    pool.shutdownNow();
797 >                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
798 >                }
799 >            }
800          } catch (SecurityException ok) {
801              // Allowed in case test doesn't have privs
802          } catch (InterruptedException fail) {
803 <            fail("Unexpected InterruptedException");
803 >            threadFail("Unexpected InterruptedException");
804          }
805      }
806  
# Line 753 | Line 813 | public class JSR166TestCase extends Test
813       * necessarily individually slow because they must block.
814       */
815      void testInParallel(Action ... actions) {
816 <        ExecutorService pool = Executors.newCachedThreadPool();
817 <        try {
816 >        try (PoolCleaner<ExecutorService> cleaner
817 >             = cleaner(Executors.newCachedThreadPool())) {
818 >            ExecutorService pool = cleaner.pool;
819              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
820              for (final Action action : actions)
821                  futures.add(pool.submit(new CheckedRunnable() {
# Line 767 | Line 828 | public class JSR166TestCase extends Test
828                  } catch (Exception ex) {
829                      threadUnexpectedException(ex);
830                  }
770 –        } finally {
771 –            joinPool(pool);
831          }
832      }
833  
834      /**
835 <     * A debugging tool to print all stack traces, as jstack does.
835 >     * A debugging tool to print stack traces of most threads, as jstack does.
836 >     * Uninteresting threads are filtered out.
837       */
838 <    static void printAllStackTraces() {
839 <        for (ThreadInfo info :
840 <                 ManagementFactory.getThreadMXBean()
841 <                 .dumpAllThreads(true, true))
838 >    static void dumpTestThreads() {
839 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
840 >        System.err.println("------ stacktrace dump start ------");
841 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
842 >            String name = info.getThreadName();
843 >            if ("Signal Dispatcher".equals(name))
844 >                continue;
845 >            if ("Reference Handler".equals(name)
846 >                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
847 >                continue;
848 >            if ("Finalizer".equals(name)
849 >                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
850 >                continue;
851 >            if ("checkForWedgedTest".equals(name))
852 >                continue;
853              System.err.print(info);
854 +        }
855 +        System.err.println("------ stacktrace dump end ------");
856      }
857  
858      /**
# Line 799 | Line 872 | public class JSR166TestCase extends Test
872              delay(millis);
873              assertTrue(thread.isAlive());
874          } catch (InterruptedException fail) {
875 <            fail("Unexpected InterruptedException");
875 >            threadFail("Unexpected InterruptedException");
876          }
877      }
878  
# Line 821 | Line 894 | public class JSR166TestCase extends Test
894              for (Thread thread : threads)
895                  assertTrue(thread.isAlive());
896          } catch (InterruptedException fail) {
897 <            fail("Unexpected InterruptedException");
897 >            threadFail("Unexpected InterruptedException");
898          }
899      }
900  
# Line 1240 | Line 1313 | public class JSR166TestCase extends Test
1313              }};
1314      }
1315  
1316 +    public Runnable countDowner(final CountDownLatch latch) {
1317 +        return new CheckedRunnable() {
1318 +            public void realRun() throws InterruptedException {
1319 +                latch.countDown();
1320 +            }};
1321 +    }
1322 +
1323      public Runnable awaiter(final CountDownLatch latch) {
1324          return new CheckedRunnable() {
1325              public void realRun() throws InterruptedException {

Diff Legend

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