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.159 by jsr166, Sun Oct 4 00:30:50 2015 UTC vs.
Revision 1.177 by jsr166, Mon Oct 12 23:52:44 2015 UTC

# Line 20 | Line 20 | import java.lang.management.ThreadMXBean
20   import java.lang.reflect.Constructor;
21   import java.lang.reflect.Method;
22   import java.lang.reflect.Modifier;
23 + import java.nio.file.Files;
24 + import java.nio.file.Paths;
25   import java.security.CodeSource;
26   import java.security.Permission;
27   import java.security.PermissionCollection;
# Line 52 | Line 54 | import java.util.concurrent.ThreadFactor
54   import java.util.concurrent.ThreadPoolExecutor;
55   import java.util.concurrent.TimeoutException;
56   import java.util.concurrent.atomic.AtomicReference;
57 + import java.util.regex.Matcher;
58   import java.util.regex.Pattern;
59  
60   import junit.framework.AssertionFailedError;
# Line 188 | Line 191 | public class JSR166TestCase extends Test
191          return (regex == null) ? null : Pattern.compile(regex);
192      }
193  
194 +    // Instrumentation to debug very rare, but very annoying hung test runs.
195      static volatile TestCase currentTestCase;
196 +    // static volatile int currentRun = 0;
197      static {
198          Runnable checkForWedgedTest = new Runnable() { public void run() {
199 <            // avoid spurious reports with enormous runsPerTest
200 <            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
199 >            // Avoid spurious reports with enormous runsPerTest.
200 >            // A single test case run should never take more than 1 second.
201 >            // But let's cap it at the high end too ...
202 >            final int timeoutMinutes =
203 >                Math.min(15, Math.max(runsPerTest / 60, 1));
204              for (TestCase lastTestCase = currentTestCase;;) {
205                  try { MINUTES.sleep(timeoutMinutes); }
206                  catch (InterruptedException unexpected) { break; }
207                  if (lastTestCase == currentTestCase) {
208 <                    System.err.println
209 <                        ("Looks like we're stuck running test: "
210 <                         + lastTestCase);
208 >                    System.err.printf(
209 >                        "Looks like we're stuck running test: %s%n",
210 >                        lastTestCase);
211 > //                     System.err.printf(
212 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
213 > //                         lastTestCase, currentRun, runsPerTest);
214 > //                     System.err.println("availableProcessors=" +
215 > //                         Runtime.getRuntime().availableProcessors());
216 > //                     System.err.printf("cpu model = %s%n", cpuModel());
217                      dumpTestThreads();
218 +                    // one stack dump is probably enough; more would be spam
219 +                    break;
220                  }
221                  lastTestCase = currentTestCase;
222              }}};
# Line 209 | Line 225 | public class JSR166TestCase extends Test
225          thread.start();
226      }
227  
228 + //     public static String cpuModel() {
229 + //         try {
230 + //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
231 + //                 .matcher(new String(
232 + //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
233 + //             matcher.find();
234 + //             return matcher.group(1);
235 + //         } catch (Exception ex) { return null; }
236 + //     }
237 +
238      public void runBare() throws Throwable {
239          currentTestCase = this;
240          if (methodFilter == null
# Line 218 | Line 244 | public class JSR166TestCase extends Test
244  
245      protected void runTest() throws Throwable {
246          for (int i = 0; i < runsPerTest; i++) {
247 +            // currentRun = i;
248              if (profileTests)
249                  runTestProfiled();
250              else
# Line 590 | Line 617 | public class JSR166TestCase extends Test
617      }
618  
619      /**
620 <     * Finds missing try { ... } finally { joinPool(e); }
620 >     * Finds missing PoolCleaners
621       */
622      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
623          Thread[] survivors = new Thread[7];
# Line 749 | Line 776 | public class JSR166TestCase extends Test
776      /**
777       * Delays, via Thread.sleep, for the given millisecond delay, but
778       * if the sleep is shorter than specified, may re-sleep or yield
779 <     * until time elapses.
779 >     * until time elapses.  Ensures that the given time, as measured
780 >     * by System.nanoTime(), has elapsed.
781       */
782      static void delay(long millis) throws InterruptedException {
783 <        long startTime = System.nanoTime();
784 <        long ns = millis * 1000 * 1000;
785 <        for (;;) {
783 >        long nanos = millis * (1000 * 1000);
784 >        final long wakeupTime = System.nanoTime() + nanos;
785 >        do {
786              if (millis > 0L)
787                  Thread.sleep(millis);
788              else // too short to sleep
789                  Thread.yield();
790 <            long d = ns - (System.nanoTime() - startTime);
791 <            if (d > 0L)
792 <                millis = d / (1000 * 1000);
765 <            else
766 <                break;
767 <        }
790 >            nanos = wakeupTime - System.nanoTime();
791 >            millis = nanos / (1000 * 1000);
792 >        } while (nanos >= 0L);
793      }
794  
795      /**
796       * Allows use of try-with-resources with per-test thread pools.
797       */
798 <    class PoolCleaner<T extends ExecutorService>
799 <            implements AutoCloseable {
800 <        public final T pool;
776 <        public PoolCleaner(T pool) { this.pool = pool; }
798 >    class PoolCleaner implements AutoCloseable {
799 >        private final ExecutorService pool;
800 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
801          public void close() { joinPool(pool); }
802      }
803  
804 <    <T extends ExecutorService> PoolCleaner<T> cleaner(T pool) {
805 <        return new PoolCleaner<T>(pool);
804 >    /**
805 >     * An extension of PoolCleaner that has an action to release the pool.
806 >     */
807 >    class PoolCleanerWithReleaser extends PoolCleaner {
808 >        private final Runnable releaser;
809 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
810 >            super(pool);
811 >            this.releaser = releaser;
812 >        }
813 >        public void close() {
814 >            try {
815 >                releaser.run();
816 >            } finally {
817 >                super.close();
818 >            }
819 >        }
820 >    }
821 >
822 >    PoolCleaner cleaner(ExecutorService pool) {
823 >        return new PoolCleaner(pool);
824 >    }
825 >
826 >    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
827 >        return new PoolCleanerWithReleaser(pool, releaser);
828 >    }
829 >
830 >    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
831 >        return new PoolCleanerWithReleaser(pool, releaser(latch));
832 >    }
833 >
834 >    Runnable releaser(final CountDownLatch latch) {
835 >        return new Runnable() { public void run() {
836 >            do { latch.countDown(); }
837 >            while (latch.getCount() > 0);
838 >        }};
839      }
840  
841      /**
# Line 794 | Line 851 | public class JSR166TestCase extends Test
851                  } finally {
852                      // last resort, for the benefit of subsequent tests
853                      pool.shutdownNow();
854 <                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
854 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
855                  }
856              }
857          } catch (SecurityException ok) {
# Line 813 | Line 870 | public class JSR166TestCase extends Test
870       * necessarily individually slow because they must block.
871       */
872      void testInParallel(Action ... actions) {
873 <        try (PoolCleaner<ExecutorService> cleaner
874 <             = cleaner(Executors.newCachedThreadPool())) {
818 <            ExecutorService pool = cleaner.pool;
873 >        ExecutorService pool = Executors.newCachedThreadPool();
874 >        try (PoolCleaner cleaner = cleaner(pool)) {
875              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
876              for (final Action action : actions)
877                  futures.add(pool.submit(new CheckedRunnable() {
# Line 1172 | Line 1228 | public class JSR166TestCase extends Test
1228          } finally {
1229              if (t.getState() != Thread.State.TERMINATED) {
1230                  t.interrupt();
1231 <                fail("Test timed out");
1231 >                threadFail("timed out waiting for thread to terminate");
1232              }
1233          }
1234      }
# Line 1320 | Line 1376 | public class JSR166TestCase extends Test
1376              }};
1377      }
1378  
1379 <    public Runnable awaiter(final CountDownLatch latch) {
1380 <        return new CheckedRunnable() {
1381 <            public void realRun() throws InterruptedException {
1382 <                await(latch);
1383 <            }};
1379 >    class LatchAwaiter extends CheckedRunnable {
1380 >        static final int NEW = 0;
1381 >        static final int RUNNING = 1;
1382 >        static final int DONE = 2;
1383 >        final CountDownLatch latch;
1384 >        int state = NEW;
1385 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1386 >        public void realRun() throws InterruptedException {
1387 >            state = 1;
1388 >            await(latch);
1389 >            state = 2;
1390 >        }
1391 >    }
1392 >
1393 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1394 >        return new LatchAwaiter(latch);
1395      }
1396  
1397      public void await(CountDownLatch latch) {
1398          try {
1399 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1399 >            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1400 >                fail("timed out waiting for CountDownLatch for "
1401 >                     + (LONG_DELAY_MS/1000) + " sec");
1402          } catch (Throwable fail) {
1403              threadUnexpectedException(fail);
1404          }
# Line 1337 | Line 1406 | public class JSR166TestCase extends Test
1406  
1407      public void await(Semaphore semaphore) {
1408          try {
1409 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1409 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1410 >                fail("timed out waiting for Semaphore for "
1411 >                     + (LONG_DELAY_MS/1000) + " sec");
1412          } catch (Throwable fail) {
1413              threadUnexpectedException(fail);
1414          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines