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.156 by jsr166, Sat Oct 3 21:09:42 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 >            for (TestCase lastTestCase = currentTestCase;;) {
195 >                try { MINUTES.sleep(10); }
196 >                catch (InterruptedException unexpected) { break; }
197 >                if (lastTestCase == currentTestCase) {
198 >                    System.err.println
199 >                        ("Looks like we're stuck running test: "
200 >                         + lastTestCase);
201 >                    dumpTestThreads();
202 >                }
203 >                lastTestCase = currentTestCase;
204 >            }}};
205 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
206 >        thread.setDaemon(true);
207 >        thread.start();
208 >    }
209 >
210 >    public void runBare() throws Throwable {
211 >        currentTestCase = this;
212          if (methodFilter == null
213 <            || methodFilter.matcher(toString()).find()) {
214 <            for (int i = 0; i < runsPerTest; i++) {
215 <                if (profileTests)
216 <                    runTestProfiled();
217 <                else
218 <                    super.runTest();
219 <            }
213 >            || methodFilter.matcher(toString()).find())
214 >            super.runBare();
215 >    }
216 >
217 >    protected void runTest() throws Throwable {
218 >        for (int i = 0; i < runsPerTest; i++) {
219 >            if (profileTests)
220 >                runTestProfiled();
221 >            else
222 >                super.runTest();
223          }
224      }
225  
# Line 456 | Line 482 | public class JSR166TestCase extends Test
482          } else {
483              return new TestSuite();
484          }
459 –
485      }
486  
487      // Delays for timing-dependent tests, in milliseconds.
# Line 514 | Line 539 | public class JSR166TestCase extends Test
539       * the same test have no effect.
540       */
541      public void threadRecordFailure(Throwable t) {
542 +        dumpTestThreads();
543          threadFailure.compareAndSet(null, t);
544      }
545  
# Line 521 | Line 547 | public class JSR166TestCase extends Test
547          setDelays();
548      }
549  
550 +    void tearDownFail(String format, Object... args) {
551 +        String msg = toString() + ": " + String.format(format, args);
552 +        System.err.println(msg);
553 +        dumpTestThreads();
554 +        throw new AssertionFailedError(msg);
555 +    }
556 +
557      /**
558       * Extra checks that get done for all test cases.
559       *
# Line 548 | Line 581 | public class JSR166TestCase extends Test
581          }
582  
583          if (Thread.interrupted())
584 <            throw new AssertionFailedError("interrupt status set in main thread");
584 >            tearDownFail("interrupt status set in main thread");
585  
586          checkForkJoinPoolThreadLeaks();
587      }
# Line 557 | Line 590 | public class JSR166TestCase extends Test
590       * Finds missing try { ... } finally { joinPool(e); }
591       */
592      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
593 <        Thread[] survivors = new Thread[5];
593 >        Thread[] survivors = new Thread[7];
594          int count = Thread.enumerate(survivors);
595          for (int i = 0; i < count; i++) {
596              Thread thread = survivors[i];
# Line 565 | Line 598 | public class JSR166TestCase extends Test
598              if (name.startsWith("ForkJoinPool-")) {
599                  // give thread some time to terminate
600                  thread.join(LONG_DELAY_MS);
601 <                if (!thread.isAlive()) continue;
602 <                throw new AssertionFailedError
603 <                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
571 <                                   toString(), name));
601 >                if (thread.isAlive())
602 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
603 >                                 thread);
604              }
605          }
606 +
607 +        if (!ForkJoinPool.commonPool()
608 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
609 +            tearDownFail("ForkJoin common pool thread stuck");
610      }
611  
612      /**
# Line 583 | Line 619 | public class JSR166TestCase extends Test
619              fail(reason);
620          } catch (AssertionFailedError t) {
621              threadRecordFailure(t);
622 <            fail(reason);
622 >            throw t;
623          }
624      }
625  
# Line 729 | Line 765 | public class JSR166TestCase extends Test
765      }
766  
767      /**
768 +     * Allows use of try-with-resources with per-test thread pools.
769 +     */
770 +    static class PoolCloser<T extends ExecutorService>
771 +            implements AutoCloseable {
772 +        public final T pool;
773 +        public PoolCloser(T pool) { this.pool = pool; }
774 +        public void close() { joinPool(pool); }
775 +    }
776 +
777 +    /**
778       * Waits out termination of a thread pool or fails doing so.
779       */
780 <    void joinPool(ExecutorService pool) {
780 >    static void joinPool(ExecutorService pool) {
781          try {
782              pool.shutdown();
783              if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
# Line 753 | Line 799 | public class JSR166TestCase extends Test
799       * necessarily individually slow because they must block.
800       */
801      void testInParallel(Action ... actions) {
802 <        ExecutorService pool = Executors.newCachedThreadPool();
803 <        try {
802 >        try (PoolCloser<ExecutorService> poolCloser
803 >             = new PoolCloser<>(Executors.newCachedThreadPool())) {
804 >            ExecutorService pool = poolCloser.pool;
805              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
806              for (final Action action : actions)
807                  futures.add(pool.submit(new CheckedRunnable() {
# Line 767 | Line 814 | public class JSR166TestCase extends Test
814                  } catch (Exception ex) {
815                      threadUnexpectedException(ex);
816                  }
770 –        } finally {
771 –            joinPool(pool);
817          }
818      }
819  
820      /**
821 <     * A debugging tool to print all stack traces, as jstack does.
821 >     * A debugging tool to print stack traces of most threads, as jstack does.
822 >     * Uninteresting threads are filtered out.
823       */
824 <    static void printAllStackTraces() {
825 <        for (ThreadInfo info :
826 <                 ManagementFactory.getThreadMXBean()
827 <                 .dumpAllThreads(true, true))
824 >    static void dumpTestThreads() {
825 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
826 >        System.err.println("------ stacktrace dump start ------");
827 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
828 >            String name = info.getThreadName();
829 >            if ("Signal Dispatcher".equals(name))
830 >                continue;
831 >            if ("Reference Handler".equals(name)
832 >                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
833 >                continue;
834 >            if ("Finalizer".equals(name)
835 >                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
836 >                continue;
837 >            if ("checkForWedgedTest".equals(name))
838 >                continue;
839              System.err.print(info);
840 +        }
841 +        System.err.println("------ stacktrace dump end ------");
842      }
843  
844      /**
# Line 1240 | Line 1299 | public class JSR166TestCase extends Test
1299              }};
1300      }
1301  
1302 +    public Runnable countDowner(final CountDownLatch latch) {
1303 +        return new CheckedRunnable() {
1304 +            public void realRun() throws InterruptedException {
1305 +                latch.countDown();
1306 +            }};
1307 +    }
1308 +
1309      public Runnable awaiter(final CountDownLatch latch) {
1310          return new CheckedRunnable() {
1311              public void realRun() throws InterruptedException {

Diff Legend

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