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.169 by jsr166, Thu Oct 8 21:50:26 2015 UTC

# Line 200 | Line 200 | public class JSR166TestCase extends Test
200                      System.err.println
201                          ("Looks like we're stuck running test: "
202                           + lastTestCase);
203 +                    System.err.println("availableProcessors=" +
204 +                        Runtime.getRuntime().availableProcessors());
205                      dumpTestThreads();
206 +                    // one stack dump is probably enough; more would be spam
207 +                    break;
208                  }
209                  lastTestCase = currentTestCase;
210              }}};
# Line 590 | Line 594 | public class JSR166TestCase extends Test
594      }
595  
596      /**
597 <     * Finds missing try { ... } finally { joinPool(e); }
597 >     * Finds missing PoolCleaners
598       */
599      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
600          Thread[] survivors = new Thread[7];
# Line 749 | Line 753 | public class JSR166TestCase extends Test
753      /**
754       * Delays, via Thread.sleep, for the given millisecond delay, but
755       * if the sleep is shorter than specified, may re-sleep or yield
756 <     * until time elapses.
756 >     * until time elapses.  Ensures that the given time, as measured
757 >     * by System.nanoTime(), has elapsed.
758       */
759      static void delay(long millis) throws InterruptedException {
760 <        long startTime = System.nanoTime();
761 <        long ns = millis * 1000 * 1000;
762 <        for (;;) {
760 >        long nanos = millis * (1000 * 1000);
761 >        final long wakeupTime = System.nanoTime() + nanos;
762 >        do {
763              if (millis > 0L)
764                  Thread.sleep(millis);
765              else // too short to sleep
766                  Thread.yield();
767 <            long d = ns - (System.nanoTime() - startTime);
768 <            if (d > 0L)
769 <                millis = d / (1000 * 1000);
765 <            else
766 <                break;
767 <        }
767 >            nanos = wakeupTime - System.nanoTime();
768 >            millis = nanos / (1000 * 1000);
769 >        } while (nanos >= 0L);
770      }
771  
772      /**
# Line 776 | Line 778 | public class JSR166TestCase extends Test
778          public void close() { joinPool(pool); }
779      }
780  
781 +    /**
782 +     * An extension of PoolCleaner that has an action to release the pool.
783 +     */
784 +    class PoolCleanerWithReleaser extends PoolCleaner {
785 +        private final Runnable releaser;
786 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
787 +            super(pool);
788 +            this.releaser = releaser;
789 +        }
790 +        public void close() {
791 +            try {
792 +                releaser.run();
793 +            } finally {
794 +                super.close();
795 +            }
796 +        }
797 +    }
798 +
799      PoolCleaner cleaner(ExecutorService pool) {
800          return new PoolCleaner(pool);
801      }
802  
803 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
804 +        return new PoolCleanerWithReleaser(pool, releaser);
805 +    }
806 +
807 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
808 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
809 +    }
810 +
811 +    Runnable releaser(final CountDownLatch latch) {
812 +        return new Runnable() { public void run() {
813 +            do { latch.countDown(); }
814 +            while (latch.getCount() > 0);
815 +        }};
816 +    }
817 +
818      /**
819       * Waits out termination of a thread pool or fails doing so.
820       */
# Line 793 | Line 828 | public class JSR166TestCase extends Test
828                  } finally {
829                      // last resort, for the benefit of subsequent tests
830                      pool.shutdownNow();
831 <                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
831 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
832                  }
833              }
834          } catch (SecurityException ok) {
# Line 1170 | Line 1205 | public class JSR166TestCase extends Test
1205          } finally {
1206              if (t.getState() != Thread.State.TERMINATED) {
1207                  t.interrupt();
1208 <                fail("Test timed out");
1208 >                threadFail("Test timed out");
1209              }
1210          }
1211      }
# Line 1319 | Line 1354 | public class JSR166TestCase extends Test
1354      }
1355  
1356      class LatchAwaiter extends CheckedRunnable {
1357 <        final static int NEW = 0;
1358 <        final static int RUNNING = 1;
1359 <        final static int DONE = 2;
1357 >        static final int NEW = 0;
1358 >        static final int RUNNING = 1;
1359 >        static final int DONE = 2;
1360          final CountDownLatch latch;
1361          int state = NEW;
1362          LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
# Line 1331 | Line 1366 | public class JSR166TestCase extends Test
1366              state = 2;
1367          }
1368      }
1369 <    
1369 >
1370      public LatchAwaiter awaiter(CountDownLatch latch) {
1371          return new LatchAwaiter(latch);
1372      }

Diff Legend

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