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.146 by jsr166, Fri Sep 25 23:32:15 2015 UTC vs.
Revision 1.157 by jsr166, Sat Oct 3 22:20:05 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 <    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 457 | Line 484 | public class JSR166TestCase extends Test
484          } else {
485              return new TestSuite();
486          }
460 –
487      }
488  
489      // Delays for timing-dependent tests, in milliseconds.
# Line 515 | Line 541 | public class JSR166TestCase extends Test
541       * the same test have no effect.
542       */
543      public void threadRecordFailure(Throwable t) {
544 +        dumpTestThreads();
545          threadFailure.compareAndSet(null, t);
546      }
547  
# Line 525 | Line 552 | public class JSR166TestCase extends Test
552      void tearDownFail(String format, Object... args) {
553          String msg = toString() + ": " + String.format(format, args);
554          System.err.println(msg);
555 <        printAllStackTraces();
555 >        dumpTestThreads();
556          throw new AssertionFailedError(msg);
557      }
558  
# Line 594 | Line 621 | public class JSR166TestCase extends Test
621              fail(reason);
622          } catch (AssertionFailedError t) {
623              threadRecordFailure(t);
624 <            fail(reason);
624 >            throw t;
625          }
626      }
627  
# Line 740 | Line 767 | public class JSR166TestCase extends Test
767      }
768  
769      /**
770 +     * Allows use of try-with-resources with per-test thread pools.
771 +     */
772 +    static class PoolCloser<T extends ExecutorService>
773 +            implements AutoCloseable {
774 +        public final T pool;
775 +        public PoolCloser(T pool) { this.pool = pool; }
776 +        public void close() { joinPool(pool); }
777 +    }
778 +
779 +    /**
780       * Waits out termination of a thread pool or fails doing so.
781       */
782 <    void joinPool(ExecutorService pool) {
782 >    static void joinPool(ExecutorService pool) {
783          try {
784              pool.shutdown();
785              if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
# Line 764 | Line 801 | public class JSR166TestCase extends Test
801       * necessarily individually slow because they must block.
802       */
803      void testInParallel(Action ... actions) {
804 <        ExecutorService pool = Executors.newCachedThreadPool();
805 <        try {
804 >        try (PoolCloser<ExecutorService> poolCloser
805 >             = new PoolCloser<>(Executors.newCachedThreadPool())) {
806 >            ExecutorService pool = poolCloser.pool;
807              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
808              for (final Action action : actions)
809                  futures.add(pool.submit(new CheckedRunnable() {
# Line 778 | Line 816 | public class JSR166TestCase extends Test
816                  } catch (Exception ex) {
817                      threadUnexpectedException(ex);
818                  }
781 –        } finally {
782 –            joinPool(pool);
819          }
820      }
821  
822      /**
823 <     * A debugging tool to print all stack traces, as jstack does.
823 >     * A debugging tool to print stack traces of most threads, as jstack does.
824 >     * Uninteresting threads are filtered out.
825       */
826 <    static void printAllStackTraces() {
827 <        for (ThreadInfo info :
828 <                 ManagementFactory.getThreadMXBean()
829 <                 .dumpAllThreads(true, true))
826 >    static void dumpTestThreads() {
827 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
828 >        System.err.println("------ stacktrace dump start ------");
829 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
830 >            String name = info.getThreadName();
831 >            if ("Signal Dispatcher".equals(name))
832 >                continue;
833 >            if ("Reference Handler".equals(name)
834 >                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
835 >                continue;
836 >            if ("Finalizer".equals(name)
837 >                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
838 >                continue;
839 >            if ("checkForWedgedTest".equals(name))
840 >                continue;
841              System.err.print(info);
842 +        }
843 +        System.err.println("------ stacktrace dump end ------");
844      }
845  
846      /**
# Line 1251 | Line 1301 | public class JSR166TestCase extends Test
1301              }};
1302      }
1303  
1304 +    public Runnable countDowner(final CountDownLatch latch) {
1305 +        return new CheckedRunnable() {
1306 +            public void realRun() throws InterruptedException {
1307 +                latch.countDown();
1308 +            }};
1309 +    }
1310 +
1311      public Runnable awaiter(final CountDownLatch latch) {
1312          return new CheckedRunnable() {
1313              public void realRun() throws InterruptedException {

Diff Legend

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