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.161 by jsr166, Sun Oct 4 03:49:33 2015 UTC vs.
Revision 1.179 by jsr166, Fri Oct 23 21:59:58 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 246 | Line 273 | public class JSR166TestCase extends Test
273          main(suite(), args);
274      }
275  
276 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
277 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
278 +        long runTime;
279 +        public void startTest(Test test) {}
280 +        protected void printHeader(long runTime) {
281 +            this.runTime = runTime; // defer printing for later
282 +        }
283 +        protected void printFooter(TestResult result) {
284 +            if (result.wasSuccessful()) {
285 +                getWriter().println("OK (" + result.runCount() + " tests)"
286 +                    + "  Time: " + elapsedTimeAsString(runTime));
287 +            } else {
288 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
289 +                super.printFooter(result);
290 +            }
291 +        }
292 +    }
293 +
294 +    /**
295 +     * Returns a TestRunner that doesn't bother with unnecessary
296 +     * fluff, like printing a "." for each test case.
297 +     */
298 +    static junit.textui.TestRunner newPithyTestRunner() {
299 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
300 +        runner.setPrinter(new PithyResultPrinter(System.out));
301 +        return runner;
302 +    }
303 +
304      /**
305       * Runs all unit tests in the given test suite.
306       * Actual behavior influenced by jsr166.* system properties.
# Line 257 | Line 312 | public class JSR166TestCase extends Test
312              System.setSecurityManager(new SecurityManager());
313          }
314          for (int i = 0; i < suiteRuns; i++) {
315 <            TestResult result = junit.textui.TestRunner.run(suite);
315 >            TestResult result = newPithyTestRunner().doRun(suite);
316              if (!result.wasSuccessful())
317                  System.exit(1);
318              System.gc();
# Line 590 | Line 645 | public class JSR166TestCase extends Test
645      }
646  
647      /**
648 <     * Finds missing try { ... } finally { joinPool(e); }
648 >     * Finds missing PoolCleaners
649       */
650      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
651          Thread[] survivors = new Thread[7];
# Line 749 | Line 804 | public class JSR166TestCase extends Test
804      /**
805       * Delays, via Thread.sleep, for the given millisecond delay, but
806       * if the sleep is shorter than specified, may re-sleep or yield
807 <     * until time elapses.
807 >     * until time elapses.  Ensures that the given time, as measured
808 >     * by System.nanoTime(), has elapsed.
809       */
810      static void delay(long millis) throws InterruptedException {
811 <        long startTime = System.nanoTime();
812 <        long ns = millis * 1000 * 1000;
813 <        for (;;) {
811 >        long nanos = millis * (1000 * 1000);
812 >        final long wakeupTime = System.nanoTime() + nanos;
813 >        do {
814              if (millis > 0L)
815                  Thread.sleep(millis);
816              else // too short to sleep
817                  Thread.yield();
818 <            long d = ns - (System.nanoTime() - startTime);
819 <            if (d > 0L)
820 <                millis = d / (1000 * 1000);
765 <            else
766 <                break;
767 <        }
818 >            nanos = wakeupTime - System.nanoTime();
819 >            millis = nanos / (1000 * 1000);
820 >        } while (nanos >= 0L);
821      }
822  
823      /**
# Line 776 | Line 829 | public class JSR166TestCase extends Test
829          public void close() { joinPool(pool); }
830      }
831  
832 +    /**
833 +     * An extension of PoolCleaner that has an action to release the pool.
834 +     */
835 +    class PoolCleanerWithReleaser extends PoolCleaner {
836 +        private final Runnable releaser;
837 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
838 +            super(pool);
839 +            this.releaser = releaser;
840 +        }
841 +        public void close() {
842 +            try {
843 +                releaser.run();
844 +            } finally {
845 +                super.close();
846 +            }
847 +        }
848 +    }
849 +
850      PoolCleaner cleaner(ExecutorService pool) {
851          return new PoolCleaner(pool);
852      }
853  
854 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
855 +        return new PoolCleanerWithReleaser(pool, releaser);
856 +    }
857 +
858 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
859 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
860 +    }
861 +
862 +    Runnable releaser(final CountDownLatch latch) {
863 +        return new Runnable() { public void run() {
864 +            do { latch.countDown(); }
865 +            while (latch.getCount() > 0);
866 +        }};
867 +    }
868 +
869      /**
870       * Waits out termination of a thread pool or fails doing so.
871       */
# Line 793 | Line 879 | public class JSR166TestCase extends Test
879                  } finally {
880                      // last resort, for the benefit of subsequent tests
881                      pool.shutdownNow();
882 <                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
882 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
883                  }
884              }
885          } catch (SecurityException ok) {
# Line 1170 | Line 1256 | public class JSR166TestCase extends Test
1256          } finally {
1257              if (t.getState() != Thread.State.TERMINATED) {
1258                  t.interrupt();
1259 <                fail("Test timed out");
1259 >                threadFail("timed out waiting for thread to terminate");
1260              }
1261          }
1262      }
# Line 1319 | Line 1405 | public class JSR166TestCase extends Test
1405      }
1406  
1407      class LatchAwaiter extends CheckedRunnable {
1408 <        final static int NEW = 0;
1409 <        final static int RUNNING = 1;
1410 <        final static int DONE = 2;
1408 >        static final int NEW = 0;
1409 >        static final int RUNNING = 1;
1410 >        static final int DONE = 2;
1411          final CountDownLatch latch;
1412          int state = NEW;
1413          LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
# Line 1331 | Line 1417 | public class JSR166TestCase extends Test
1417              state = 2;
1418          }
1419      }
1420 <    
1420 >
1421      public LatchAwaiter awaiter(CountDownLatch latch) {
1422          return new LatchAwaiter(latch);
1423      }
1424  
1425      public void await(CountDownLatch latch) {
1426          try {
1427 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1427 >            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1428 >                fail("timed out waiting for CountDownLatch for "
1429 >                     + (LONG_DELAY_MS/1000) + " sec");
1430          } catch (Throwable fail) {
1431              threadUnexpectedException(fail);
1432          }
# Line 1346 | Line 1434 | public class JSR166TestCase extends Test
1434  
1435      public void await(Semaphore semaphore) {
1436          try {
1437 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1437 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1438 >                fail("timed out waiting for Semaphore for "
1439 >                     + (LONG_DELAY_MS/1000) + " sec");
1440          } catch (Throwable fail) {
1441              threadUnexpectedException(fail);
1442          }

Diff Legend

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