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.147 by jsr166, Sat Sep 26 19:08:26 2015 UTC vs.
Revision 1.158 by jsr166, Sat Oct 3 23:17:03 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 +                    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              super.runBare();
# Line 460 | Line 484 | public class JSR166TestCase extends Test
484          } else {
485              return new TestSuite();
486          }
463 –
487      }
488  
489      // Delays for timing-dependent tests, in milliseconds.
# Line 518 | 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 528 | Line 553 | public class JSR166TestCase extends Test
553      void tearDownFail(String format, Object... args) {
554          String msg = toString() + ": " + String.format(format, args);
555          System.err.println(msg);
556 <        printAllStackTraces();
556 >        dumpTestThreads();
557          throw new AssertionFailedError(msg);
558      }
559  
# Line 597 | 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 743 | 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 PoolCloser<T extends ExecutorService>
774 +            implements AutoCloseable {
775 +        public final T pool;
776 +        public PoolCloser(T pool) { this.pool = pool; }
777 +        public void close() { joinPool(pool); }
778 +    }
779 +
780 +    /**
781       * Waits out termination of a thread pool or fails doing so.
782       */
783      void joinPool(ExecutorService pool) {
784          try {
785              pool.shutdown();
786 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
787 <                fail("ExecutorService " + pool +
788 <                     " did not terminate in a timely manner");
786 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
787 >                try {
788 >                    threadFail("ExecutorService " + pool +
789 >                               " did not terminate in a timely manner");
790 >                } finally {
791 >                    // last resort, for the benefit of subsequent tests
792 >                    pool.shutdownNow();
793 >                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
794 >                }
795 >            }
796          } catch (SecurityException ok) {
797              // Allowed in case test doesn't have privs
798          } catch (InterruptedException fail) {
799 <            fail("Unexpected InterruptedException");
799 >            threadFail("Unexpected InterruptedException");
800          }
801      }
802  
# Line 767 | Line 809 | public class JSR166TestCase extends Test
809       * necessarily individually slow because they must block.
810       */
811      void testInParallel(Action ... actions) {
812 <        ExecutorService pool = Executors.newCachedThreadPool();
813 <        try {
812 >        try (PoolCloser<ExecutorService> poolCloser
813 >             = new PoolCloser<>(Executors.newCachedThreadPool())) {
814 >            ExecutorService pool = poolCloser.pool;
815              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
816              for (final Action action : actions)
817                  futures.add(pool.submit(new CheckedRunnable() {
# Line 781 | Line 824 | public class JSR166TestCase extends Test
824                  } catch (Exception ex) {
825                      threadUnexpectedException(ex);
826                  }
784 –        } finally {
785 –            joinPool(pool);
827          }
828      }
829  
830      /**
831 <     * A debugging tool to print all stack traces, as jstack does.
831 >     * A debugging tool to print stack traces of most threads, as jstack does.
832 >     * Uninteresting threads are filtered out.
833       */
834 <    static void printAllStackTraces() {
835 <        for (ThreadInfo info :
836 <                 ManagementFactory.getThreadMXBean()
837 <                 .dumpAllThreads(true, true))
834 >    static void dumpTestThreads() {
835 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
836 >        System.err.println("------ stacktrace dump start ------");
837 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
838 >            String name = info.getThreadName();
839 >            if ("Signal Dispatcher".equals(name))
840 >                continue;
841 >            if ("Reference Handler".equals(name)
842 >                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
843 >                continue;
844 >            if ("Finalizer".equals(name)
845 >                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
846 >                continue;
847 >            if ("checkForWedgedTest".equals(name))
848 >                continue;
849              System.err.print(info);
850 +        }
851 +        System.err.println("------ stacktrace dump end ------");
852      }
853  
854      /**
# Line 813 | Line 868 | public class JSR166TestCase extends Test
868              delay(millis);
869              assertTrue(thread.isAlive());
870          } catch (InterruptedException fail) {
871 <            fail("Unexpected InterruptedException");
871 >            threadFail("Unexpected InterruptedException");
872          }
873      }
874  
# Line 835 | Line 890 | public class JSR166TestCase extends Test
890              for (Thread thread : threads)
891                  assertTrue(thread.isAlive());
892          } catch (InterruptedException fail) {
893 <            fail("Unexpected InterruptedException");
893 >            threadFail("Unexpected InterruptedException");
894          }
895      }
896  
# Line 1254 | Line 1309 | public class JSR166TestCase extends Test
1309              }};
1310      }
1311  
1312 +    public Runnable countDowner(final CountDownLatch latch) {
1313 +        return new CheckedRunnable() {
1314 +            public void realRun() throws InterruptedException {
1315 +                latch.countDown();
1316 +            }};
1317 +    }
1318 +
1319      public Runnable awaiter(final CountDownLatch latch) {
1320          return new CheckedRunnable() {
1321              public void realRun() throws InterruptedException {

Diff Legend

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