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.154 by jsr166, Sat Oct 3 19:39:16 2015 UTC vs.
Revision 1.165 by jsr166, Mon Oct 5 01:10:09 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 187 | 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 +                    // one stack dump is probably enough; more would be spam
205 +                    break;
206 +                }
207 +                lastTestCase = currentTestCase;
208 +            }}};
209 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
210 +        thread.setDaemon(true);
211 +        thread.start();
212 +    }
213 +
214      public void runBare() throws Throwable {
215 +        currentTestCase = this;
216          if (methodFilter == null
217              || methodFilter.matcher(toString()).find())
218              super.runBare();
# Line 461 | Line 486 | public class JSR166TestCase extends Test
486          } else {
487              return new TestSuite();
488          }
464 –
489      }
490  
491      // Delays for timing-dependent tests, in milliseconds.
# Line 519 | Line 543 | public class JSR166TestCase extends Test
543       * the same test have no effect.
544       */
545      public void threadRecordFailure(Throwable t) {
546 <        threadDump();
546 >        System.err.println(t);
547 >        dumpTestThreads();
548          threadFailure.compareAndSet(null, t);
549      }
550  
# Line 530 | Line 555 | public class JSR166TestCase extends Test
555      void tearDownFail(String format, Object... args) {
556          String msg = toString() + ": " + String.format(format, args);
557          System.err.println(msg);
558 <        threadDump();
558 >        dumpTestThreads();
559          throw new AssertionFailedError(msg);
560      }
561  
# Line 567 | Line 592 | public class JSR166TestCase extends Test
592      }
593  
594      /**
595 <     * Finds missing try { ... } finally { joinPool(e); }
595 >     * Finds missing PoolCleaners
596       */
597      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
598          Thread[] survivors = new Thread[7];
# Line 726 | Line 751 | public class JSR166TestCase extends Test
751      /**
752       * Delays, via Thread.sleep, for the given millisecond delay, but
753       * if the sleep is shorter than specified, may re-sleep or yield
754 <     * until time elapses.
754 >     * until time elapses.  Ensures that the given time, as measured
755 >     * by System.nanoTime(), has elapsed.
756       */
757      static void delay(long millis) throws InterruptedException {
758 <        long startTime = System.nanoTime();
759 <        long ns = millis * 1000 * 1000;
760 <        for (;;) {
758 >        long nanos = millis * (1000 * 1000);
759 >        final long wakeupTime = System.nanoTime() + nanos;
760 >        do {
761              if (millis > 0L)
762                  Thread.sleep(millis);
763              else // too short to sleep
764                  Thread.yield();
765 <            long d = ns - (System.nanoTime() - startTime);
766 <            if (d > 0L)
767 <                millis = d / (1000 * 1000);
742 <            else
743 <                break;
744 <        }
765 >            nanos = wakeupTime - System.nanoTime();
766 >            millis = nanos / (1000 * 1000);
767 >        } while (nanos >= 0L);
768      }
769  
770      /**
771       * Allows use of try-with-resources with per-test thread pools.
772       */
773 <    static class PoolCloser<T extends ExecutorService>
774 <            implements AutoCloseable {
775 <        public final T pool;
753 <        public PoolCloser(T pool) { this.pool = pool; }
773 >    class PoolCleaner implements AutoCloseable {
774 >        private final ExecutorService pool;
775 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
776          public void close() { joinPool(pool); }
777      }
778  
779 +    PoolCleaner cleaner(ExecutorService pool) {
780 +        return new PoolCleaner(pool);
781 +    }
782 +
783      /**
784       * Waits out termination of a thread pool or fails doing so.
785       */
786 <    static void joinPool(ExecutorService pool) {
786 >    void joinPool(ExecutorService pool) {
787          try {
788              pool.shutdown();
789 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
790 <                fail("ExecutorService " + pool +
791 <                     " did not terminate in a timely manner");
789 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
790 >                try {
791 >                    threadFail("ExecutorService " + pool +
792 >                               " did not terminate in a timely manner");
793 >                } finally {
794 >                    // last resort, for the benefit of subsequent tests
795 >                    pool.shutdownNow();
796 >                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
797 >                }
798 >            }
799          } catch (SecurityException ok) {
800              // Allowed in case test doesn't have privs
801          } catch (InterruptedException fail) {
802 <            fail("Unexpected InterruptedException");
802 >            threadFail("Unexpected InterruptedException");
803          }
804      }
805  
# Line 779 | Line 812 | public class JSR166TestCase extends Test
812       * necessarily individually slow because they must block.
813       */
814      void testInParallel(Action ... actions) {
815 <        try (PoolCloser<ExecutorService> poolCloser
816 <             = new PoolCloser<>(Executors.newCachedThreadPool())) {
784 <            ExecutorService pool = poolCloser.pool;
815 >        ExecutorService pool = Executors.newCachedThreadPool();
816 >        try (PoolCleaner cleaner = cleaner(pool)) {
817              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
818              for (final Action action : actions)
819                  futures.add(pool.submit(new CheckedRunnable() {
# Line 798 | Line 830 | public class JSR166TestCase extends Test
830      }
831  
832      /**
833 <     * A debugging tool to print all stack traces, as jstack does.
833 >     * A debugging tool to print stack traces of most threads, as jstack does.
834       * Uninteresting threads are filtered out.
835       */
836 <    static void threadDump() {
836 >    static void dumpTestThreads() {
837          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
838          System.err.println("------ stacktrace dump start ------");
839          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
# Line 814 | Line 846 | public class JSR166TestCase extends Test
846              if ("Finalizer".equals(name)
847                  && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
848                  continue;
849 +            if ("checkForWedgedTest".equals(name))
850 +                continue;
851              System.err.print(info);
852          }
853          System.err.println("------ stacktrace dump end ------");
# Line 836 | Line 870 | public class JSR166TestCase extends Test
870              delay(millis);
871              assertTrue(thread.isAlive());
872          } catch (InterruptedException fail) {
873 <            fail("Unexpected InterruptedException");
873 >            threadFail("Unexpected InterruptedException");
874          }
875      }
876  
# Line 858 | Line 892 | public class JSR166TestCase extends Test
892              for (Thread thread : threads)
893                  assertTrue(thread.isAlive());
894          } catch (InterruptedException fail) {
895 <            fail("Unexpected InterruptedException");
895 >            threadFail("Unexpected InterruptedException");
896          }
897      }
898  
# Line 1284 | Line 1318 | public class JSR166TestCase extends Test
1318              }};
1319      }
1320  
1321 <    public Runnable awaiter(final CountDownLatch latch) {
1322 <        return new CheckedRunnable() {
1323 <            public void realRun() throws InterruptedException {
1324 <                await(latch);
1325 <            }};
1321 >    class LatchAwaiter extends CheckedRunnable {
1322 >        static final int NEW = 0;
1323 >        static final int RUNNING = 1;
1324 >        static final int DONE = 2;
1325 >        final CountDownLatch latch;
1326 >        int state = NEW;
1327 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1328 >        public void realRun() throws InterruptedException {
1329 >            state = 1;
1330 >            await(latch);
1331 >            state = 2;
1332 >        }
1333 >    }
1334 >
1335 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1336 >        return new LatchAwaiter(latch);
1337      }
1338  
1339      public void await(CountDownLatch latch) {

Diff Legend

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