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.41 by jsr166, Mon Jul 17 21:01:30 2017 UTC vs.
Revision 1.45 by jsr166, Wed Jun 13 18:36:31 2018 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  
# Line 31 | 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 38 | 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 79 | 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 135 | 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 219 | 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:
# Line 247 | Line 252 | public class AbstractQueuedLongSynchroni
252                  break;
253              case awaitNanos:
254                  startTime = System.nanoTime();
255 <                long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
256 <                long nanosRemaining = c.awaitNanos(nanosTimeout);
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);
# Line 1251 | 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 (ThreadLocalRandom.current().nextBoolean())
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