ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java
(Generate patch)

Comparing jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java (file contents):
Revision 1.30 by jsr166, Wed Dec 31 19:23:56 2014 UTC vs.
Revision 1.46 by jsr166, Tue Aug 13 00:54:51 2019 UTC

# Line 12 | Line 12 | import static java.util.concurrent.TimeU
12   import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.HashSet;
15 + import java.util.concurrent.ThreadLocalRandom;
16   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer;
17   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject;
18  
18 – import junit.framework.AssertionFailedError;
19   import junit.framework.Test;
20   import junit.framework.TestSuite;
21  
22 + @SuppressWarnings("WaitNotInLoop") // we implement spurious-wakeup freedom
23   public class AbstractQueuedLongSynchronizerTest extends JSR166TestCase {
24      public static void main(String[] args) {
25 <        junit.textui.TestRunner.run(suite());
25 >        main(suite(), args);
26      }
27      public static Test suite() {
28          return new TestSuite(AbstractQueuedLongSynchronizerTest.class);
# Line 30 | Line 31 | public class AbstractQueuedLongSynchroni
31      /**
32       * A simple mutex class, adapted from the class javadoc.  Exclusive
33       * acquire tests exercise this as a sample user extension.
34 +     *
35 +     * Unlike the javadoc sample, we don't track owner thread via
36 +     * AbstractOwnableSynchronizer methods.
37       */
38      static class Mutex extends AbstractQueuedLongSynchronizer {
39          /** An eccentric value > 32 bits for locked synchronizer state. */
# Line 37 | Line 41 | public class AbstractQueuedLongSynchroni
41  
42          static final long UNLOCKED = 0;
43  
44 <        public boolean isHeldExclusively() {
44 >        /** Owner thread is untracked, so this is really just isLocked(). */
45 >        @Override public boolean isHeldExclusively() {
46              long state = getState();
47              assertTrue(state == UNLOCKED || state == LOCKED);
48              return state == LOCKED;
49          }
50  
51 <        public boolean tryAcquire(long acquires) {
51 >        @Override protected boolean tryAcquire(long acquires) {
52              assertEquals(LOCKED, acquires);
53              return compareAndSetState(UNLOCKED, LOCKED);
54          }
55  
56 <        public boolean tryRelease(long releases) {
56 >        @Override protected boolean tryRelease(long releases) {
57              if (getState() != LOCKED) throw new IllegalMonitorStateException();
58              setState(UNLOCKED);
59              return true;
# Line 78 | Line 83 | public class AbstractQueuedLongSynchroni
83              release(LOCKED);
84          }
85  
86 +        /** Faux-Implements Lock.newCondition(). */
87          public ConditionObject newCondition() {
88              return new ConditionObject();
89          }
90      }
91  
92      /**
93 <     * A simple latch class, to test shared mode.
93 >     * A minimal latch class, to test shared mode.
94       */
95      static class BooleanLatch extends AbstractQueuedLongSynchronizer {
96          public boolean isSignalled() { return getState() != 0; }
# Line 94 | Line 100 | public class AbstractQueuedLongSynchroni
100          }
101  
102          public boolean tryReleaseShared(long ignore) {
103 <            setState(1 << 62);
103 >            setState(1L << 62);
104              return true;
105          }
106      }
# Line 134 | Line 140 | public class AbstractQueuedLongSynchroni
140          long startTime = System.nanoTime();
141          while (!sync.isQueued(t)) {
142              if (millisElapsedSince(startTime) > LONG_DELAY_MS)
143 <                throw new AssertionFailedError("timed out");
143 >                throw new AssertionError("timed out");
144              Thread.yield();
145          }
146          assertTrue(t.isAlive());
# Line 218 | Line 224 | public class AbstractQueuedLongSynchroni
224              assertTrue(c.await(timeoutMillis, MILLISECONDS));
225              break;
226          case awaitNanos:
227 <            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
228 <            long nanosRemaining = c.awaitNanos(nanosTimeout);
227 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
228 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
229              assertTrue(nanosRemaining > 0);
230              break;
231          case awaitUntil:
232              assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
233              break;
234 +        default:
235 +            throw new AssertionError();
236          }
237      }
238  
# Line 233 | Line 241 | public class AbstractQueuedLongSynchroni
241       * default timeout duration).
242       */
243      void assertAwaitTimesOut(ConditionObject c, AwaitMethod awaitMethod) {
244 <        long timeoutMillis = timeoutMillis();
245 <        long startTime = System.nanoTime();
244 >        final long timeoutMillis = timeoutMillis();
245 >        final long startTime;
246          try {
247              switch (awaitMethod) {
248              case awaitTimed:
249 +                startTime = System.nanoTime();
250                  assertFalse(c.await(timeoutMillis, MILLISECONDS));
251 +                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
252                  break;
253              case awaitNanos:
254 <                long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
255 <                long nanosRemaining = c.awaitNanos(nanosTimeout);
254 >                startTime = System.nanoTime();
255 >                long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
256 >                long nanosRemaining = c.awaitNanos(timeoutNanos);
257                  assertTrue(nanosRemaining <= 0);
258 +                assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
259 +                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
260                  break;
261              case awaitUntil:
262 +                // We shouldn't assume that nanoTime and currentTimeMillis
263 +                // use the same time source, so don't use nanoTime here.
264 +                java.util.Date delayedDate = delayedDate(timeoutMillis);
265                  assertFalse(c.awaitUntil(delayedDate(timeoutMillis)));
266 +                assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
267                  break;
268              default:
269                  throw new UnsupportedOperationException();
270              }
271          } catch (InterruptedException ie) { threadUnexpectedException(ie); }
255 –        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
272      }
273  
274      /**
# Line 955 | Line 971 | public class AbstractQueuedLongSynchroni
971       */
972      public void testAwaitUninterruptibly() {
973          final Mutex sync = new Mutex();
974 <        final ConditionObject c = sync.newCondition();
974 >        final ConditionObject condition = sync.newCondition();
975          final BooleanLatch pleaseInterrupt = new BooleanLatch();
976          Thread t = newStartedThread(new CheckedRunnable() {
977              public void realRun() {
978                  sync.acquire();
979                  assertTrue(pleaseInterrupt.releaseShared(0));
980 <                c.awaitUninterruptibly();
980 >                condition.awaitUninterruptibly();
981                  assertTrue(Thread.interrupted());
982 <                assertHasWaitersLocked(sync, c, NO_THREADS);
982 >                assertHasWaitersLocked(sync, condition, NO_THREADS);
983                  sync.release();
984              }});
985  
986          pleaseInterrupt.acquireShared(0);
987          sync.acquire();
988 <        assertHasWaitersLocked(sync, c, t);
988 >        assertHasWaitersLocked(sync, condition, t);
989          sync.release();
990          t.interrupt();
991 <        assertHasWaitersUnlocked(sync, c, t);
992 <        assertThreadStaysAlive(t);
991 >        assertHasWaitersUnlocked(sync, condition, t);
992 >        assertThreadBlocks(t, Thread.State.WAITING);
993          sync.acquire();
994 <        assertHasWaitersLocked(sync, c, t);
994 >        assertHasWaitersLocked(sync, condition, t);
995          assertHasExclusiveQueuedThreads(sync, NO_THREADS);
996 <        c.signal();
997 <        assertHasWaitersLocked(sync, c, NO_THREADS);
996 >        condition.signal();
997 >        assertHasWaitersLocked(sync, condition, NO_THREADS);
998          assertHasExclusiveQueuedThreads(sync, t);
999          sync.release();
1000          awaitTermination(t);
# Line 1121 | Line 1137 | public class AbstractQueuedLongSynchroni
1137  
1138          waitForQueuedThread(l, t);
1139          assertFalse(l.isSignalled());
1140 <        assertThreadStaysAlive(t);
1140 >        assertThreadBlocks(t, Thread.State.WAITING);
1141          assertHasSharedQueuedThreads(l, t);
1142          assertTrue(l.releaseShared(0));
1143          assertTrue(l.isSignalled());
# Line 1146 | Line 1162 | public class AbstractQueuedLongSynchroni
1162  
1163          waitForQueuedThread(l, t);
1164          assertFalse(l.isSignalled());
1165 <        assertThreadStaysAlive(t);
1165 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1166          assertTrue(l.releaseShared(0));
1167          assertTrue(l.isSignalled());
1168          awaitTermination(t);
# Line 1195 | Line 1211 | public class AbstractQueuedLongSynchroni
1211      public void testTryAcquireSharedNanos_Timeout() {
1212          final BooleanLatch l = new BooleanLatch();
1213          final BooleanLatch observedQueued = new BooleanLatch();
1198 –        final long timeoutMillis = timeoutMillis();
1214          Thread t = newStartedThread(new CheckedRunnable() {
1215              public void realRun() throws InterruptedException {
1216                  assertFalse(l.isSignalled());
# Line 1241 | Line 1256 | public class AbstractQueuedLongSynchroni
1256          sync.release();
1257      }
1258  
1259 +    /**
1260 +     * Tests scenario for
1261 +     * JDK-8191937: Lost interrupt in AbstractQueuedSynchronizer when tryAcquire methods throw
1262 +     */
1263 +    public void testInterruptedFailingAcquire() throws InterruptedException {
1264 +        final RuntimeException ex = new RuntimeException();
1265 +
1266 +        // A synchronizer only offering a choice of failure modes
1267 +        class Sync extends AbstractQueuedLongSynchronizer {
1268 +            boolean pleaseThrow;
1269 +            @Override protected boolean tryAcquire(long ignored) {
1270 +                if (pleaseThrow) throw ex;
1271 +                return false;
1272 +            }
1273 +            @Override protected long tryAcquireShared(long ignored) {
1274 +                if (pleaseThrow) throw ex;
1275 +                return -1;
1276 +            }
1277 +            @Override protected boolean tryRelease(long ignored) {
1278 +                return true;
1279 +            }
1280 +            @Override protected boolean tryReleaseShared(long ignored) {
1281 +                return true;
1282 +            }
1283 +        }
1284 +
1285 +        final Sync s = new Sync();
1286 +
1287 +        final Thread thread = newStartedThread(new CheckedRunnable() {
1288 +            public void realRun() {
1289 +                try {
1290 +                    if (randomBoolean())
1291 +                        s.acquire(1);
1292 +                    else
1293 +                        s.acquireShared(1);
1294 +                    shouldThrow();
1295 +                } catch (Throwable t) {
1296 +                    assertSame(ex, t);
1297 +                    assertTrue(Thread.interrupted());
1298 +                }
1299 +            }});
1300 +        waitForThreadToEnterWaitState(thread);
1301 +        assertSame(thread, s.getFirstQueuedThread());
1302 +        assertTrue(s.hasQueuedPredecessors());
1303 +        assertTrue(s.hasQueuedThreads());
1304 +        assertEquals(1, s.getQueueLength());
1305 +
1306 +        s.pleaseThrow = true;
1307 +        thread.interrupt();
1308 +        s.release(1);
1309 +        awaitTermination(thread);
1310 +    }
1311 +
1312   }

Diff Legend

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