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.164 by jsr166, Sun Oct 4 18:40:57 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 774 | 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 791 | 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 1168 | 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      }

Diff Legend

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