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.162 by jsr166, Sun Oct 4 04:40:00 2015 UTC vs.
Revision 1.165 by jsr166, Mon Oct 5 01:10:09 2015 UTC

# Line 201 | Line 201 | public class JSR166TestCase extends Test
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              }}};
# Line 590 | 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 749 | 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);
765 <            else
766 <                break;
767 <        }
765 >            nanos = wakeupTime - System.nanoTime();
766 >            millis = nanos / (1000 * 1000);
767 >        } while (nanos >= 0L);
768      }
769  
770      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines