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

Comparing jsr166/src/test/tck/StampedLockTest.java (file contents):
Revision 1.26 by jsr166, Sun Jul 17 03:06:50 2016 UTC vs.
Revision 1.27 by jsr166, Wed Aug 10 17:05:13 2016 UTC

# Line 7 | Line 7
7  
8   import static java.util.concurrent.TimeUnit.DAYS;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.SECONDS;
11  
12   import java.util.ArrayList;
13   import java.util.List;
14   import java.util.concurrent.CountDownLatch;
15 + import java.util.concurrent.Future;
16   import java.util.concurrent.TimeUnit;
17   import java.util.concurrent.locks.Lock;
18   import java.util.concurrent.locks.StampedLock;
# Line 30 | Line 32 | public class StampedLockTest extends JSR
32      }
33  
34      /**
33     * A runnable calling writeLockInterruptibly
34     */
35    class InterruptibleLockRunnable extends CheckedRunnable {
36        final StampedLock lock;
37        InterruptibleLockRunnable(StampedLock l) { lock = l; }
38        public void realRun() throws InterruptedException {
39            lock.writeLockInterruptibly();
40        }
41    }
42
43    /**
44     * A runnable calling writeLockInterruptibly that expects to be
45     * interrupted
46     */
47    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
48        final StampedLock lock;
49        InterruptedLockRunnable(StampedLock l) { lock = l; }
50        public void realRun() throws InterruptedException {
51            lock.writeLockInterruptibly();
52        }
53    }
54
55    /**
35       * Releases write lock, checking isWriteLocked before and after
36       */
37 <    void releaseWriteLock(StampedLock lock, long s) {
37 >    void releaseWriteLock(StampedLock lock, long stamp) {
38          assertTrue(lock.isWriteLocked());
39 <        lock.unlockWrite(s);
39 >        assertValid(lock, stamp);
40 >        lock.unlockWrite(stamp);
41          assertFalse(lock.isWriteLocked());
42 +        assertFalse(lock.validate(stamp));
43      }
44  
45      /**
46 <     * Constructed StampedLock is in unlocked state
46 >     * Releases read lock, checking isReadLocked before and after
47       */
48 <    public void testConstructor() {
49 <        StampedLock lock;
50 <        lock = new StampedLock();
51 <        assertFalse(lock.isWriteLocked());
48 >    void releaseReadLock(StampedLock lock, long stamp) {
49 >        assertTrue(lock.isReadLocked());
50 >        assertValid(lock, stamp);
51 >        lock.unlockRead(stamp);
52          assertFalse(lock.isReadLocked());
53 <        assertEquals(lock.getReadLockCount(), 0);
53 >        assertTrue(lock.validate(stamp));
54      }
55  
56 <    /**
57 <     * write-locking and read-locking an unlocked lock succeed
58 <     */
78 <    public void testLock() {
79 <        StampedLock lock = new StampedLock();
80 <        assertFalse(lock.isWriteLocked());
81 <        assertFalse(lock.isReadLocked());
82 <        assertEquals(lock.getReadLockCount(), 0);
83 <        long s = lock.writeLock();
84 <        assertTrue(lock.isWriteLocked());
85 <        assertFalse(lock.isReadLocked());
86 <        assertEquals(lock.getReadLockCount(), 0);
87 <        lock.unlockWrite(s);
88 <        assertFalse(lock.isWriteLocked());
89 <        assertFalse(lock.isReadLocked());
90 <        assertEquals(lock.getReadLockCount(), 0);
91 <        long rs = lock.readLock();
92 <        assertFalse(lock.isWriteLocked());
93 <        assertTrue(lock.isReadLocked());
94 <        assertEquals(lock.getReadLockCount(), 1);
95 <        lock.unlockRead(rs);
96 <        assertFalse(lock.isWriteLocked());
97 <        assertFalse(lock.isReadLocked());
98 <        assertEquals(lock.getReadLockCount(), 0);
56 >    long assertNonZero(long v) {
57 >        assertTrue(v != 0L);
58 >        return v;
59      }
60  
61 <    /**
62 <     * unlock releases either a read or write lock
63 <     */
64 <    public void testUnlock() {
105 <        StampedLock lock = new StampedLock();
106 <        assertFalse(lock.isWriteLocked());
107 <        assertFalse(lock.isReadLocked());
108 <        assertEquals(lock.getReadLockCount(), 0);
109 <        long s = lock.writeLock();
110 <        assertTrue(lock.isWriteLocked());
111 <        assertFalse(lock.isReadLocked());
112 <        assertEquals(lock.getReadLockCount(), 0);
113 <        lock.unlock(s);
114 <        assertFalse(lock.isWriteLocked());
115 <        assertFalse(lock.isReadLocked());
116 <        assertEquals(lock.getReadLockCount(), 0);
117 <        long rs = lock.readLock();
118 <        assertFalse(lock.isWriteLocked());
119 <        assertTrue(lock.isReadLocked());
120 <        assertEquals(lock.getReadLockCount(), 1);
121 <        lock.unlock(rs);
122 <        assertFalse(lock.isWriteLocked());
123 <        assertFalse(lock.isReadLocked());
124 <        assertEquals(lock.getReadLockCount(), 0);
61 >    long assertValid(StampedLock lock, long stamp) {
62 >        assertTrue(stamp != 0L);
63 >        assertTrue(lock.validate(stamp));
64 >        return stamp;
65      }
66  
67 <    /**
128 <     * tryUnlockRead/Write succeeds if locked in associated mode else
129 <     * returns false
130 <     */
131 <    public void testTryUnlock() {
132 <        StampedLock lock = new StampedLock();
133 <        assertFalse(lock.isWriteLocked());
67 >    void assertUnlocked(StampedLock lock) {
68          assertFalse(lock.isReadLocked());
135        assertEquals(lock.getReadLockCount(), 0);
136        long s = lock.writeLock();
137        assertTrue(lock.isWriteLocked());
138        assertFalse(lock.isReadLocked());
139        assertEquals(lock.getReadLockCount(), 0);
140        assertFalse(lock.tryUnlockRead());
141        assertTrue(lock.tryUnlockWrite());
142        assertFalse(lock.tryUnlockWrite());
143        assertFalse(lock.tryUnlockRead());
144        assertFalse(lock.isWriteLocked());
145        assertFalse(lock.isReadLocked());
146        assertEquals(lock.getReadLockCount(), 0);
147        long rs = lock.readLock();
148        assertFalse(lock.isWriteLocked());
149        assertTrue(lock.isReadLocked());
150        assertEquals(lock.getReadLockCount(), 1);
151        assertFalse(lock.tryUnlockWrite());
152        assertTrue(lock.tryUnlockRead());
153        assertFalse(lock.tryUnlockRead());
154        assertFalse(lock.tryUnlockWrite());
69          assertFalse(lock.isWriteLocked());
70 <        assertFalse(lock.isReadLocked());
71 <        assertEquals(lock.getReadLockCount(), 0);
70 >        assertEquals(0, lock.getReadLockCount());
71 >        assertValid(lock, lock.tryOptimisticRead());
72      }
73  
74 <    /**
75 <     * write-unlocking an unlocked lock throws IllegalMonitorStateException
76 <     */
77 <    public void testWriteUnlock_IMSE() {
78 <        StampedLock lock = new StampedLock();
79 <        try {
80 <            lock.unlockWrite(0L);
81 <            shouldThrow();
82 <        } catch (IllegalMonitorStateException success) {}
74 >    List<Action> lockLockers(Lock lock) {
75 >        List<Action> lockers = new ArrayList<>();
76 >        lockers.add(() -> lock.lock());
77 >        lockers.add(() -> lock.lockInterruptibly());
78 >        lockers.add(() -> lock.tryLock());
79 >        lockers.add(() -> lock.tryLock(Long.MIN_VALUE, DAYS));
80 >        lockers.add(() -> lock.tryLock(0L, DAYS));
81 >        lockers.add(() -> lock.tryLock(Long.MAX_VALUE, DAYS));
82 >        return lockers;
83 >    }
84 >
85 >    List<Function<StampedLock, Long>> readLockers() {
86 >        List<Function<StampedLock, Long>> readLockers = new ArrayList<>();
87 >        readLockers.add((sl) -> sl.readLock());
88 >        readLockers.add((sl) -> sl.tryReadLock());
89 >        readLockers.add((sl) -> readLockInterruptiblyUninterrupted(sl));
90 >        readLockers.add((sl) -> tryReadLockUninterrupted(sl, Long.MIN_VALUE, DAYS));
91 >        readLockers.add((sl) -> tryReadLockUninterrupted(sl, 0L, DAYS));
92 >        readLockers.add((sl) -> sl.tryConvertToReadLock(sl.tryOptimisticRead()));
93 >        return readLockers;
94 >    }
95 >
96 >    List<BiConsumer<StampedLock, Long>> readUnlockers() {
97 >        List<BiConsumer<StampedLock, Long>> readUnlockers = new ArrayList<>();
98 >        readUnlockers.add((sl, stamp) -> sl.unlockRead(stamp));
99 >        readUnlockers.add((sl, stamp) -> assertTrue(sl.tryUnlockRead()));
100 >        readUnlockers.add((sl, stamp) -> sl.asReadLock().unlock());
101 >        readUnlockers.add((sl, stamp) -> sl.unlock(stamp));
102 >        readUnlockers.add((sl, stamp) -> assertValid(sl, sl.tryConvertToOptimisticRead(stamp)));
103 >        return readUnlockers;
104 >    }
105 >
106 >    List<Function<StampedLock, Long>> writeLockers() {
107 >        List<Function<StampedLock, Long>> writeLockers = new ArrayList<>();
108 >        writeLockers.add((sl) -> sl.writeLock());
109 >        writeLockers.add((sl) -> sl.tryWriteLock());
110 >        writeLockers.add((sl) -> writeLockInterruptiblyUninterrupted(sl));
111 >        writeLockers.add((sl) -> tryWriteLockUninterrupted(sl, Long.MIN_VALUE, DAYS));
112 >        writeLockers.add((sl) -> tryWriteLockUninterrupted(sl, 0L, DAYS));
113 >        writeLockers.add((sl) -> sl.tryConvertToWriteLock(sl.tryOptimisticRead()));
114 >        return writeLockers;
115 >    }
116 >
117 >    List<BiConsumer<StampedLock, Long>> writeUnlockers() {
118 >        List<BiConsumer<StampedLock, Long>> writeUnlockers = new ArrayList<>();
119 >        writeUnlockers.add((sl, stamp) -> sl.unlockWrite(stamp));
120 >        writeUnlockers.add((sl, stamp) -> assertTrue(sl.tryUnlockWrite()));
121 >        writeUnlockers.add((sl, stamp) -> sl.asWriteLock().unlock());
122 >        writeUnlockers.add((sl, stamp) -> sl.unlock(stamp));
123 >        writeUnlockers.add((sl, stamp) -> assertValid(sl, sl.tryConvertToOptimisticRead(stamp)));
124 >        return writeUnlockers;
125      }
126  
127      /**
128 <     * write-unlocking an unlocked lock throws IllegalMonitorStateException
128 >     * Constructed StampedLock is in unlocked state
129       */
130 <    public void testWriteUnlock_IMSE2() {
131 <        StampedLock lock = new StampedLock();
176 <        long s = lock.writeLock();
177 <        lock.unlockWrite(s);
178 <        try {
179 <            lock.unlockWrite(s);
180 <            shouldThrow();
181 <        } catch (IllegalMonitorStateException success) {}
130 >    public void testConstructor() {
131 >        assertUnlocked(new StampedLock());
132      }
133  
134      /**
135 <     * write-unlocking after readlock throws IllegalMonitorStateException
135 >     * write-locking, then unlocking, an unlocked lock succeed
136       */
137 <    public void testWriteUnlock_IMSE3() {
137 >    public void testWriteLock_lockUnlock() {
138          StampedLock lock = new StampedLock();
139 <        long s = lock.readLock();
140 <        try {
141 <            lock.unlockWrite(s);
142 <            shouldThrow();
143 <        } catch (IllegalMonitorStateException success) {}
139 >
140 >        for (Function<StampedLock, Long> writeLocker : writeLockers())
141 >        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers()) {
142 >            assertFalse(lock.isWriteLocked());
143 >            assertFalse(lock.isReadLocked());
144 >            assertEquals(0, lock.getReadLockCount());
145 >
146 >            long s = writeLocker.apply(lock);
147 >            assertValid(lock, s);
148 >            assertTrue(lock.isWriteLocked());
149 >            assertFalse(lock.isReadLocked());
150 >            assertEquals(0, lock.getReadLockCount());
151 >            writeUnlocker.accept(lock, s);
152 >            assertUnlocked(lock);
153 >        }
154      }
155  
156      /**
157 <     * read-unlocking an unlocked lock throws IllegalMonitorStateException
157 >     * read-locking, then unlocking, an unlocked lock succeed
158       */
159 <    public void testReadUnlock_IMSE() {
159 >    public void testReadLock_lockUnlock() {
160          StampedLock lock = new StampedLock();
161 <        long s = lock.readLock();
162 <        lock.unlockRead(s);
163 <        try {
164 <            lock.unlockRead(s);
165 <            shouldThrow();
166 <        } catch (IllegalMonitorStateException success) {}
161 >
162 >        for (Function<StampedLock, Long> readLocker : readLockers())
163 >        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers()) {
164 >            long s = 42;
165 >            for (int i = 0; i < 2; i++) {
166 >                s = assertValid(lock, readLocker.apply(lock));
167 >                assertFalse(lock.isWriteLocked());
168 >                assertTrue(lock.isReadLocked());
169 >                assertEquals(i + 1, lock.getReadLockCount());
170 >            }
171 >            for (int i = 0; i < 2; i++) {
172 >                assertFalse(lock.isWriteLocked());
173 >                assertTrue(lock.isReadLocked());
174 >                assertEquals(2 - i, lock.getReadLockCount());
175 >                readUnlocker.accept(lock, s);
176 >            }
177 >            assertUnlocked(lock);
178 >        }
179      }
180  
181      /**
182 <     * read-unlocking an unlocked lock throws IllegalMonitorStateException
182 >     * tryUnlockWrite fails if not write locked
183       */
184 <    public void testReadUnlock_IMSE2() {
184 >    public void testTryUnlockWrite_failure() {
185          StampedLock lock = new StampedLock();
186 <        try {
187 <            lock.unlockRead(0L);
188 <            shouldThrow();
189 <        } catch (IllegalMonitorStateException success) {}
186 >        assertFalse(lock.tryUnlockWrite());
187 >
188 >        for (Function<StampedLock, Long> readLocker : readLockers())
189 >        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers()) {
190 >            long s = assertValid(lock, readLocker.apply(lock));
191 >            assertFalse(lock.tryUnlockWrite());
192 >            assertTrue(lock.isReadLocked());
193 >            readUnlocker.accept(lock, s);
194 >            assertUnlocked(lock);
195 >        }
196      }
197  
198      /**
199 <     * read-unlocking after writeLock throws IllegalMonitorStateException
199 >     * tryUnlockRead fails if not read locked
200       */
201 <    public void testReadUnlock_IMSE3() {
201 >    public void testTryUnlockRead_failure() {
202          StampedLock lock = new StampedLock();
203 <        long s = lock.writeLock();
204 <        try {
205 <            lock.unlockRead(s);
206 <            shouldThrow();
207 <        } catch (IllegalMonitorStateException success) {}
203 >        assertFalse(lock.tryUnlockRead());
204 >
205 >        for (Function<StampedLock, Long> writeLocker : writeLockers())
206 >        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers()) {
207 >            long s = writeLocker.apply(lock);
208 >            assertFalse(lock.tryUnlockRead());
209 >            assertTrue(lock.isWriteLocked());
210 >            writeUnlocker.accept(lock, s);
211 >            assertUnlocked(lock);
212 >        }
213      }
214  
215      /**
216 <     * validate(0) fails
216 >     * validate(0L) fails
217       */
218      public void testValidate0() {
219          StampedLock lock = new StampedLock();
# Line 238 | Line 221 | public class StampedLockTest extends JSR
221      }
222  
223      /**
224 <     * A stamp obtained from a successful lock operation validates
224 >     * A stamp obtained from a successful lock operation validates while the lock is held
225       */
226      public void testValidate() throws InterruptedException {
227          StampedLock lock = new StampedLock();
228 <        long s = lock.writeLock();
229 <        assertTrue(lock.validate(s));
230 <        lock.unlockWrite(s);
231 <        s = lock.readLock();
232 <        assertTrue(lock.validate(s));
233 <        lock.unlockRead(s);
234 <        assertTrue((s = lock.tryWriteLock()) != 0L);
235 <        assertTrue(lock.validate(s));
236 <        lock.unlockWrite(s);
237 <        assertTrue((s = lock.tryReadLock()) != 0L);
238 <        assertTrue(lock.validate(s));
239 <        lock.unlockRead(s);
240 <        assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
241 <        assertTrue(lock.validate(s));
259 <        lock.unlockWrite(s);
260 <        assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
261 <        assertTrue(lock.validate(s));
262 <        lock.unlockRead(s);
263 <        assertTrue((s = lock.tryOptimisticRead()) != 0L);
228 >
229 >        for (Function<StampedLock, Long> readLocker : readLockers())
230 >        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers()) {
231 >            long s = assertNonZero(readLocker.apply(lock));
232 >            assertTrue(lock.validate(s));
233 >            readUnlocker.accept(lock, s);
234 >        }
235 >
236 >        for (Function<StampedLock, Long> writeLocker : writeLockers())
237 >        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers()) {
238 >            long s = assertNonZero(writeLocker.apply(lock));
239 >            assertTrue(lock.validate(s));
240 >            writeUnlocker.accept(lock, s);
241 >        }
242      }
243  
244      /**
# Line 268 | Line 246 | public class StampedLockTest extends JSR
246       */
247      public void testValidate2() throws InterruptedException {
248          StampedLock lock = new StampedLock();
249 <        long s;
272 <        assertTrue((s = lock.writeLock()) != 0L);
249 >        long s = assertNonZero(lock.writeLock());
250          assertTrue(lock.validate(s));
251          assertFalse(lock.validate(lock.tryWriteLock()));
252 <        assertFalse(lock.validate(lock.tryWriteLock(10L, MILLISECONDS)));
252 >        assertFalse(lock.validate(lock.tryWriteLock(0L, SECONDS)));
253          assertFalse(lock.validate(lock.tryReadLock()));
254 <        assertFalse(lock.validate(lock.tryReadLock(10L, MILLISECONDS)));
254 >        assertFalse(lock.validate(lock.tryReadLock(0L, SECONDS)));
255          assertFalse(lock.validate(lock.tryOptimisticRead()));
256          lock.unlockWrite(s);
257      }
258  
259 +    void assertThrowInterruptedExceptionWhenPreInterrupted(Action[] actions) {
260 +        for (Action action : actions) {
261 +            Thread.currentThread().interrupt();
262 +            try {
263 +                action.run();
264 +                shouldThrow();
265 +            }
266 +            catch (InterruptedException success) {}
267 +            catch (Throwable fail) { threadUnexpectedException(fail); }
268 +            assertFalse(Thread.interrupted());
269 +        }
270 +    }
271 +
272      /**
273 <     * writeLockInterruptibly is interruptible
273 >     * interruptible operations throw InterruptedException when pre-interrupted
274       */
275 <    public void testWriteLockInterruptibly_Interruptible()
286 <            throws InterruptedException {
275 >    public void testInterruptibleOperationsThrowInterruptedExceptionWhenPreInterrupted() {
276          final CountDownLatch running = new CountDownLatch(1);
277          final StampedLock lock = new StampedLock();
289        long s = lock.writeLock();
290        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
291            public void realRun() throws InterruptedException {
292                running.countDown();
293                lock.writeLockInterruptibly();
294            }});
278  
279 <        running.await();
280 <        waitForThreadToEnterWaitState(t, 100);
281 <        t.interrupt();
282 <        awaitTermination(t);
283 <        releaseWriteLock(lock, s);
279 >        Action[] interruptibleLockActions = {
280 >            () -> lock.writeLockInterruptibly(),
281 >            () -> lock.tryWriteLock(Long.MIN_VALUE, DAYS),
282 >            () -> lock.tryWriteLock(Long.MAX_VALUE, DAYS),
283 >            () -> lock.readLockInterruptibly(),
284 >            () -> lock.tryReadLock(Long.MIN_VALUE, DAYS),
285 >            () -> lock.tryReadLock(Long.MAX_VALUE, DAYS),
286 >            () -> lock.asWriteLock().lockInterruptibly(),
287 >            () -> lock.asWriteLock().tryLock(0L, DAYS),
288 >            () -> lock.asWriteLock().tryLock(Long.MAX_VALUE, DAYS),
289 >            () -> lock.asReadLock().lockInterruptibly(),
290 >            () -> lock.asReadLock().tryLock(0L, DAYS),
291 >            () -> lock.asReadLock().tryLock(Long.MAX_VALUE, DAYS),
292 >        };
293 >        shuffle(interruptibleLockActions);
294 >
295 >        assertThrowInterruptedExceptionWhenPreInterrupted(interruptibleLockActions);
296 >        {
297 >            long s = lock.writeLock();
298 >            assertThrowInterruptedExceptionWhenPreInterrupted(interruptibleLockActions);
299 >            lock.unlockWrite(s);
300 >        }
301 >        {
302 >            long s = lock.readLock();
303 >            assertThrowInterruptedExceptionWhenPreInterrupted(interruptibleLockActions);
304 >            lock.unlockRead(s);
305 >        }
306 >    }
307 >
308 >    void assertThrowInterruptedExceptionWhenInterrupted(Action[] actions) {
309 >        int n = actions.length;
310 >        Future<?>[] futures = new Future<?>[n];
311 >        CountDownLatch threadsStarted = new CountDownLatch(n);
312 >        CountDownLatch done = new CountDownLatch(n);
313 >
314 >        for (int i = 0; i < n; i++) {
315 >            Action action = actions[i];
316 >            futures[i] = cachedThreadPool.submit(new CheckedRunnable() {
317 >                public void realRun() throws Throwable {
318 >                    threadsStarted.countDown();
319 >                    try {
320 >                        action.run();
321 >                        shouldThrow();
322 >                    }
323 >                    catch (InterruptedException success) {}
324 >                    catch (Throwable fail) { threadUnexpectedException(fail); }
325 >                    assertFalse(Thread.interrupted());
326 >                    done.countDown();
327 >                }});
328 >        }
329 >
330 >        await(threadsStarted);
331 >        assertEquals(n, done.getCount());
332 >        for (Future<?> future : futures) // Interrupt all the tasks
333 >            future.cancel(true);
334 >        await(done);
335      }
336  
337      /**
338 <     * timed tryWriteLock is interruptible
338 >     * interruptible operations throw InterruptedException when write locked and interrupted
339       */
340 <    public void testWriteTryLock_Interruptible() throws InterruptedException {
340 >    public void testInterruptibleOperationsThrowInterruptedExceptionWriteLockedInterrupted() {
341          final CountDownLatch running = new CountDownLatch(1);
342          final StampedLock lock = new StampedLock();
343          long s = lock.writeLock();
310        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
311            public void realRun() throws InterruptedException {
312                running.countDown();
313                lock.tryWriteLock(2 * LONG_DELAY_MS, MILLISECONDS);
314            }});
344  
345 <        running.await();
346 <        waitForThreadToEnterWaitState(t, 100);
347 <        t.interrupt();
348 <        awaitTermination(t);
349 <        releaseWriteLock(lock, s);
345 >        Action[] interruptibleLockBlockingActions = {
346 >            () -> lock.writeLockInterruptibly(),
347 >            () -> lock.tryWriteLock(Long.MAX_VALUE, DAYS),
348 >            () -> lock.readLockInterruptibly(),
349 >            () -> lock.tryReadLock(Long.MAX_VALUE, DAYS),
350 >            () -> lock.asWriteLock().lockInterruptibly(),
351 >            () -> lock.asWriteLock().tryLock(Long.MAX_VALUE, DAYS),
352 >            () -> lock.asReadLock().lockInterruptibly(),
353 >            () -> lock.asReadLock().tryLock(Long.MAX_VALUE, DAYS),
354 >        };
355 >        shuffle(interruptibleLockBlockingActions);
356 >
357 >        assertThrowInterruptedExceptionWhenInterrupted(interruptibleLockBlockingActions);
358      }
359  
360      /**
361 <     * readLockInterruptibly is interruptible
361 >     * interruptible operations throw InterruptedException when read locked and interrupted
362       */
363 <    public void testReadLockInterruptibly_Interruptible()
327 <            throws InterruptedException {
363 >    public void testInterruptibleOperationsThrowInterruptedExceptionReadLockedInterrupted() {
364          final CountDownLatch running = new CountDownLatch(1);
365          final StampedLock lock = new StampedLock();
366 <        long s = lock.writeLock();
331 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
332 <            public void realRun() throws InterruptedException {
333 <                running.countDown();
334 <                lock.readLockInterruptibly();
335 <            }});
366 >        long s = lock.readLock();
367  
368 <        running.await();
369 <        waitForThreadToEnterWaitState(t, 100);
370 <        t.interrupt();
371 <        awaitTermination(t);
372 <        releaseWriteLock(lock, s);
368 >        Action[] interruptibleLockBlockingActions = {
369 >            () -> lock.writeLockInterruptibly(),
370 >            () -> lock.tryWriteLock(Long.MAX_VALUE, DAYS),
371 >            () -> lock.asWriteLock().lockInterruptibly(),
372 >            () -> lock.asWriteLock().tryLock(Long.MAX_VALUE, DAYS),
373 >        };
374 >        shuffle(interruptibleLockBlockingActions);
375 >
376 >        assertThrowInterruptedExceptionWhenInterrupted(interruptibleLockBlockingActions);
377      }
378  
379      /**
380 <     * timed tryReadLock is interruptible
380 >     * Non-interruptible operations ignore and preserve interrupt status
381       */
382 <    public void testReadTryLock_Interruptible() throws InterruptedException {
348 <        final CountDownLatch running = new CountDownLatch(1);
382 >    public void testNonInterruptibleOperationsIgnoreInterrupts() {
383          final StampedLock lock = new StampedLock();
384 <        long s = lock.writeLock();
351 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
352 <            public void realRun() throws InterruptedException {
353 <                running.countDown();
354 <                lock.tryReadLock(2 * LONG_DELAY_MS, MILLISECONDS);
355 <            }});
384 >        Thread.currentThread().interrupt();
385  
386 <        running.await();
387 <        waitForThreadToEnterWaitState(t, 100);
388 <        t.interrupt();
389 <        awaitTermination(t);
390 <        releaseWriteLock(lock, s);
386 >        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers()) {
387 >            long s = assertValid(lock, lock.readLock());
388 >            readUnlocker.accept(lock, s);
389 >            s = assertValid(lock, lock.tryReadLock());
390 >            readUnlocker.accept(lock, s);
391 >        }
392 >
393 >        lock.asReadLock().lock();
394 >        lock.asReadLock().unlock();
395 >
396 >        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers()) {
397 >            long s = assertValid(lock, lock.writeLock());
398 >            writeUnlocker.accept(lock, s);
399 >            s = assertValid(lock, lock.tryWriteLock());
400 >            writeUnlocker.accept(lock, s);
401 >        }
402 >
403 >        lock.asWriteLock().lock();
404 >        lock.asWriteLock().unlock();
405 >
406 >        assertTrue(Thread.interrupted());
407      }
408  
409      /**
410       * tryWriteLock on an unlocked lock succeeds
411       */
412 <    public void testWriteTryLock() {
412 >    public void testTryWriteLock() {
413          final StampedLock lock = new StampedLock();
414          long s = lock.tryWriteLock();
415          assertTrue(s != 0L);
416          assertTrue(lock.isWriteLocked());
417 <        long s2 = lock.tryWriteLock();
373 <        assertEquals(s2, 0L);
417 >        assertEquals(0L, lock.tryWriteLock());
418          releaseWriteLock(lock, s);
419      }
420  
421      /**
422       * tryWriteLock fails if locked
423       */
424 <    public void testWriteTryLockWhenLocked() {
424 >    public void testTryWriteLockWhenLocked() {
425          final StampedLock lock = new StampedLock();
426          long s = lock.writeLock();
427          Thread t = newStartedThread(new CheckedRunnable() {
428              public void realRun() {
429 <                long ws = lock.tryWriteLock();
386 <                assertTrue(ws == 0L);
429 >                assertEquals(0L, lock.tryWriteLock());
430              }});
431  
432 +        assertEquals(0L, lock.tryWriteLock());
433          awaitTermination(t);
434          releaseWriteLock(lock, s);
435      }
# Line 393 | Line 437 | public class StampedLockTest extends JSR
437      /**
438       * tryReadLock fails if write-locked
439       */
440 <    public void testReadTryLockWhenLocked() {
440 >    public void testTryReadLockWhenLocked() {
441          final StampedLock lock = new StampedLock();
442          long s = lock.writeLock();
443          Thread t = newStartedThread(new CheckedRunnable() {
444              public void realRun() {
445 <                long rs = lock.tryReadLock();
402 <                assertEquals(rs, 0L);
445 >                assertEquals(0L, lock.tryReadLock());
446              }});
447  
448 +        assertEquals(0L, lock.tryReadLock());
449          awaitTermination(t);
450          releaseWriteLock(lock, s);
451      }
# Line 415 | Line 459 | public class StampedLockTest extends JSR
459          Thread t = newStartedThread(new CheckedRunnable() {
460              public void realRun() throws InterruptedException {
461                  long s2 = lock.tryReadLock();
462 <                assertTrue(s2 != 0L);
462 >                assertValid(lock, s2);
463                  lock.unlockRead(s2);
464                  long s3 = lock.tryReadLock(LONG_DELAY_MS, MILLISECONDS);
465 <                assertTrue(s3 != 0L);
465 >                assertValid(lock, s3);
466                  lock.unlockRead(s3);
467                  long s4 = lock.readLock();
468 +                assertValid(lock, s4);
469                  lock.unlockRead(s4);
470 +                lock.asReadLock().lock();
471 +                lock.asReadLock().unlock();
472 +                lock.asReadLock().lockInterruptibly();
473 +                lock.asReadLock().unlock();
474 +                lock.asReadLock().tryLock(Long.MIN_VALUE, DAYS);
475 +                lock.asReadLock().unlock();
476              }});
477  
478          awaitTermination(t);
# Line 443 | Line 494 | public class StampedLockTest extends JSR
494              }});
495  
496          running.await();
497 <        waitForThreadToEnterWaitState(t, 100);
497 >        waitForThreadToEnterWaitState(t, MEDIUM_DELAY_MS);
498          assertFalse(lock.isWriteLocked());
499          lock.unlockRead(rs);
500          awaitTermination(t);
# Line 470 | Line 521 | public class StampedLockTest extends JSR
521                  lock.unlockWrite(ws);
522              }});
523  
524 +        assertTrue(lock.isReadLocked());
525          assertFalse(lock.isWriteLocked());
526          lock.unlockRead(s);
527          awaitTermination(t2);
# Line 481 | Line 533 | public class StampedLockTest extends JSR
533       */
534      public void testReadAfterWriteLock() {
535          final StampedLock lock = new StampedLock();
536 +        final CountDownLatch threadsStarted = new CountDownLatch(2);
537          final long s = lock.writeLock();
538          Thread t1 = newStartedThread(new CheckedRunnable() {
539              public void realRun() {
540 +                threadsStarted.countDown();
541                  long rs = lock.readLock();
542                  lock.unlockRead(rs);
543              }});
544          Thread t2 = newStartedThread(new CheckedRunnable() {
545              public void realRun() {
546 +                threadsStarted.countDown();
547                  long rs = lock.readLock();
548                  lock.unlockRead(rs);
549              }});
550  
551 +        await(threadsStarted);
552 +        waitForThreadToEnterWaitState(t1, MEDIUM_DELAY_MS);
553 +        waitForThreadToEnterWaitState(t2, MEDIUM_DELAY_MS);
554          releaseWriteLock(lock, s);
555          awaitTermination(t1);
556          awaitTermination(t2);
557      }
558  
559      /**
560 <     * tryReadLock succeeds if readlocked but not writelocked
560 >     * tryReadLock succeeds if read locked but not write locked
561       */
562      public void testTryLockWhenReadLocked() {
563          final StampedLock lock = new StampedLock();
# Line 507 | Line 565 | public class StampedLockTest extends JSR
565          Thread t = newStartedThread(new CheckedRunnable() {
566              public void realRun() {
567                  long rs = lock.tryReadLock();
568 <                threadAssertTrue(rs != 0L);
568 >                assertValid(lock, rs);
569                  lock.unlockRead(rs);
570              }});
571  
# Line 516 | Line 574 | public class StampedLockTest extends JSR
574      }
575  
576      /**
577 <     * tryWriteLock fails when readlocked
577 >     * tryWriteLock fails when read locked
578       */
579 <    public void testWriteTryLockWhenReadLocked() {
579 >    public void testTryWriteLockWhenReadLocked() {
580          final StampedLock lock = new StampedLock();
581          long s = lock.readLock();
582          Thread t = newStartedThread(new CheckedRunnable() {
583              public void realRun() {
584 <                long ws = lock.tryWriteLock();
527 <                threadAssertEquals(ws, 0L);
584 >                threadAssertEquals(0L, lock.tryWriteLock());
585              }});
586  
587          awaitTermination(t);
# Line 532 | Line 589 | public class StampedLockTest extends JSR
589      }
590  
591      /**
592 <     * timed tryWriteLock times out if locked
592 >     * timed lock operations time out if lock not available
593       */
594 <    public void testWriteTryLock_Timeout() {
594 >    public void testTimedLock_Timeout() throws Exception {
595 >        ArrayList<Future<?>> futures = new ArrayList<>();
596 >
597 >        // Write locked
598          final StampedLock lock = new StampedLock();
599 <        long s = lock.writeLock();
600 <        Thread t = newStartedThread(new CheckedRunnable() {
599 >        long stamp = lock.writeLock();
600 >        assertEquals(0L, lock.tryReadLock(0L, DAYS));
601 >        assertEquals(0L, lock.tryReadLock(Long.MIN_VALUE, DAYS));
602 >        assertFalse(lock.asReadLock().tryLock(0L, DAYS));
603 >        assertFalse(lock.asReadLock().tryLock(Long.MIN_VALUE, DAYS));
604 >        assertEquals(0L, lock.tryWriteLock(0L, DAYS));
605 >        assertEquals(0L, lock.tryWriteLock(Long.MIN_VALUE, DAYS));
606 >        assertFalse(lock.asWriteLock().tryLock(0L, DAYS));
607 >        assertFalse(lock.asWriteLock().tryLock(Long.MIN_VALUE, DAYS));
608 >
609 >        futures.add(cachedThreadPool.submit(new CheckedRunnable() {
610              public void realRun() throws InterruptedException {
611                  long startTime = System.nanoTime();
612 <                long timeoutMillis = 10;
613 <                long ws = lock.tryWriteLock(timeoutMillis, MILLISECONDS);
614 <                assertEquals(ws, 0L);
546 <                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
547 <            }});
612 >                assertEquals(0L, lock.tryWriteLock(timeoutMillis(), MILLISECONDS));
613 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
614 >            }}));
615  
616 <        awaitTermination(t);
617 <        releaseWriteLock(lock, s);
618 <    }
616 >        futures.add(cachedThreadPool.submit(new CheckedRunnable() {
617 >            public void realRun() throws InterruptedException {
618 >                long startTime = System.nanoTime();
619 >                assertEquals(0L, lock.tryReadLock(timeoutMillis(), MILLISECONDS));
620 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
621 >            }}));
622 >
623 >        // Read locked
624 >        final StampedLock lock2 = new StampedLock();
625 >        long stamp2 = lock2.readLock();
626 >        assertEquals(0L, lock2.tryWriteLock(0L, DAYS));
627 >        assertEquals(0L, lock2.tryWriteLock(Long.MIN_VALUE, DAYS));
628 >        assertFalse(lock2.asWriteLock().tryLock(0L, DAYS));
629 >        assertFalse(lock2.asWriteLock().tryLock(Long.MIN_VALUE, DAYS));
630  
631 <    /**
554 <     * timed tryReadLock times out if write-locked
555 <     */
556 <    public void testReadTryLock_Timeout() {
557 <        final StampedLock lock = new StampedLock();
558 <        long s = lock.writeLock();
559 <        Thread t = newStartedThread(new CheckedRunnable() {
631 >        futures.add(cachedThreadPool.submit(new CheckedRunnable() {
632              public void realRun() throws InterruptedException {
633                  long startTime = System.nanoTime();
634 <                long timeoutMillis = 10;
635 <                long rs = lock.tryReadLock(timeoutMillis, MILLISECONDS);
636 <                assertEquals(rs, 0L);
565 <                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
566 <            }});
634 >                assertEquals(0L, lock2.tryWriteLock(timeoutMillis(), MILLISECONDS));
635 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
636 >            }}));
637  
638 <        awaitTermination(t);
639 <        assertTrue(lock.isWriteLocked());
640 <        lock.unlockWrite(s);
638 >        for (Future<?> future : futures)
639 >            assertNull(future.get());
640 >
641 >        releaseWriteLock(lock, stamp);
642 >        releaseReadLock(lock2, stamp2);
643      }
644  
645      /**
646 <     * writeLockInterruptibly succeeds if unlocked, else is interruptible
646 >     * writeLockInterruptibly succeeds if unlocked
647       */
648      public void testWriteLockInterruptibly() throws InterruptedException {
577        final CountDownLatch running = new CountDownLatch(1);
649          final StampedLock lock = new StampedLock();
650          long s = lock.writeLockInterruptibly();
580        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
581            public void realRun() throws InterruptedException {
582                running.countDown();
583                lock.writeLockInterruptibly();
584            }});
585
586        running.await();
587        waitForThreadToEnterWaitState(t, 100);
588        t.interrupt();
651          assertTrue(lock.isWriteLocked());
590        awaitTermination(t);
652          releaseWriteLock(lock, s);
653      }
654  
655      /**
656 <     * readLockInterruptibly succeeds if lock free else is interruptible
656 >     * readLockInterruptibly succeeds if lock free
657       */
658      public void testReadLockInterruptibly() throws InterruptedException {
598        final CountDownLatch running = new CountDownLatch(1);
659          final StampedLock lock = new StampedLock();
660 <        long s;
661 <        s = lock.readLockInterruptibly();
660 >
661 >        long s = assertValid(lock, lock.readLockInterruptibly());
662 >        assertTrue(lock.isReadLocked());
663          lock.unlockRead(s);
603        s = lock.writeLockInterruptibly();
604        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
605            public void realRun() throws InterruptedException {
606                running.countDown();
607                lock.readLockInterruptibly();
608            }});
664  
665 <        running.await();
666 <        waitForThreadToEnterWaitState(t, 100);
667 <        t.interrupt();
613 <        awaitTermination(t);
614 <        releaseWriteLock(lock, s);
665 >        lock.asReadLock().lockInterruptibly();
666 >        assertTrue(lock.isReadLocked());
667 >        lock.asReadLock().unlock();
668      }
669  
670      /**
# Line 643 | Line 696 | public class StampedLockTest extends JSR
696      }
697  
698      /**
699 <     * tryOptimisticRead succeeds and validates if unlocked, fails if locked
699 >     * tryOptimisticRead succeeds and validates if unlocked, fails if
700 >     * exclusively locked
701       */
702      public void testValidateOptimistic() throws InterruptedException {
703          StampedLock lock = new StampedLock();
704 <        long s, p;
705 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
706 <        assertTrue(lock.validate(p));
707 <        assertTrue((s = lock.writeLock()) != 0L);
708 <        assertFalse((p = lock.tryOptimisticRead()) != 0L);
709 <        assertTrue(lock.validate(s));
710 <        lock.unlockWrite(s);
711 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
712 <        assertTrue(lock.validate(p));
713 <        assertTrue((s = lock.readLock()) != 0L);
714 <        assertTrue(lock.validate(s));
715 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
716 <        assertTrue(lock.validate(p));
717 <        lock.unlockRead(s);
718 <        assertTrue((s = lock.tryWriteLock()) != 0L);
719 <        assertTrue(lock.validate(s));
720 <        assertFalse((p = lock.tryOptimisticRead()) != 0L);
667 <        lock.unlockWrite(s);
668 <        assertTrue((s = lock.tryReadLock()) != 0L);
669 <        assertTrue(lock.validate(s));
670 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
671 <        lock.unlockRead(s);
672 <        assertTrue(lock.validate(p));
673 <        assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
674 <        assertFalse((p = lock.tryOptimisticRead()) != 0L);
675 <        assertTrue(lock.validate(s));
676 <        lock.unlockWrite(s);
677 <        assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
678 <        assertTrue(lock.validate(s));
679 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
680 <        lock.unlockRead(s);
681 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
704 >
705 >        assertValid(lock, lock.tryOptimisticRead());
706 >
707 >        for (Function<StampedLock, Long> writeLocker : writeLockers()) {
708 >            long s = assertValid(lock, writeLocker.apply(lock));
709 >            assertEquals(0L, lock.tryOptimisticRead());
710 >            releaseWriteLock(lock, s);
711 >        }
712 >
713 >        for (Function<StampedLock, Long> readLocker : readLockers()) {
714 >            long s = assertValid(lock, readLocker.apply(lock));
715 >            long p = assertValid(lock, lock.tryOptimisticRead());
716 >            releaseReadLock(lock, s);
717 >            assertTrue(lock.validate(p));
718 >        }
719 >
720 >        assertValid(lock, lock.tryOptimisticRead());
721      }
722  
723      /**
724       * tryOptimisticRead stamp does not validate if a write lock intervenes
725       */
726      public void testValidateOptimisticWriteLocked() {
727 <        StampedLock lock = new StampedLock();
728 <        long s, p;
729 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
691 <        assertTrue((s = lock.writeLock()) != 0L);
727 >        final StampedLock lock = new StampedLock();
728 >        final long p = assertValid(lock, lock.tryOptimisticRead());
729 >        final long s = assertValid(lock, lock.writeLock());
730          assertFalse(lock.validate(p));
731 <        assertFalse((p = lock.tryOptimisticRead()) != 0L);
731 >        assertEquals(0L, lock.tryOptimisticRead());
732          assertTrue(lock.validate(s));
733          lock.unlockWrite(s);
734      }
# Line 703 | Line 741 | public class StampedLockTest extends JSR
741              throws InterruptedException {
742          final CountDownLatch running = new CountDownLatch(1);
743          final StampedLock lock = new StampedLock();
744 <        long s, p;
745 <        assertTrue((p = lock.tryOptimisticRead()) != 0L);
744 >        final long p = assertValid(lock, lock.tryOptimisticRead());
745 >
746          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
747              public void realRun() throws InterruptedException {
748                  lock.writeLockInterruptibly();
# Line 714 | Line 752 | public class StampedLockTest extends JSR
752  
753          running.await();
754          assertFalse(lock.validate(p));
755 <        assertFalse((p = lock.tryOptimisticRead()) != 0L);
755 >        assertEquals(0L, lock.tryOptimisticRead());
756          t.interrupt();
757          awaitTermination(t);
758      }
759  
760      /**
761 <     * tryConvertToOptimisticRead succeeds and validates if successfully locked,
761 >     * tryConvertToOptimisticRead succeeds and validates if successfully locked
762       */
763      public void testTryConvertToOptimisticRead() throws InterruptedException {
764          StampedLock lock = new StampedLock();
765 <        long s, p;
765 >        long s, p, q;
766          assertEquals(0L, lock.tryConvertToOptimisticRead(0L));
767  
768 <        assertTrue((s = lock.tryOptimisticRead()) != 0L);
731 <        assertEquals(s, lock.tryConvertToOptimisticRead(s));
732 <        assertTrue(lock.validate(s));
733 <
734 <        assertTrue((p = lock.readLock()) != 0L);
735 <        assertTrue((s = lock.tryOptimisticRead()) != 0L);
768 >        s = assertValid(lock, lock.tryOptimisticRead());
769          assertEquals(s, lock.tryConvertToOptimisticRead(s));
770          assertTrue(lock.validate(s));
738        lock.unlockRead(p);
739
740        assertTrue((s = lock.writeLock()) != 0L);
741        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
742        assertTrue(lock.validate(p));
743
744        assertTrue((s = lock.readLock()) != 0L);
745        assertTrue(lock.validate(s));
746        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
747        assertTrue(lock.validate(p));
748
749        assertTrue((s = lock.tryWriteLock()) != 0L);
750        assertTrue(lock.validate(s));
751        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
752        assertTrue(lock.validate(p));
771  
772 <        assertTrue((s = lock.tryReadLock()) != 0L);
773 <        assertTrue(lock.validate(s));
774 <        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
775 <        assertTrue(lock.validate(p));
776 <
777 <        assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
778 <        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
761 <        assertTrue(lock.validate(p));
772 >        for (Function<StampedLock, Long> writeLocker : writeLockers()) {
773 >            s = assertValid(lock, writeLocker.apply(lock));
774 >            p = assertValid(lock, lock.tryConvertToOptimisticRead(s));
775 >            assertFalse(lock.validate(s));
776 >            assertTrue(lock.validate(p));
777 >            assertUnlocked(lock);
778 >        }
779  
780 <        assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
781 <        assertTrue(lock.validate(s));
782 <        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
783 <        assertTrue(lock.validate(p));
780 >        for (Function<StampedLock, Long> readLocker : readLockers()) {
781 >            s = assertValid(lock, readLocker.apply(lock));
782 >            q = assertValid(lock, lock.tryOptimisticRead());
783 >            assertEquals(q, lock.tryConvertToOptimisticRead(q));
784 >            assertTrue(lock.validate(q));
785 >            assertTrue(lock.isReadLocked());
786 >            p = assertValid(lock, lock.tryConvertToOptimisticRead(s));
787 >            assertTrue(lock.validate(p));
788 >            assertTrue(lock.validate(s));
789 >            assertUnlocked(lock);
790 >            assertEquals(q, lock.tryConvertToOptimisticRead(q));
791 >            assertTrue(lock.validate(q));
792 >        }
793      }
794  
795      /**
796 <     * tryConvertToReadLock succeeds and validates if successfully locked
771 <     * or lock free;
796 >     * tryConvertToReadLock succeeds for valid stamps
797       */
798      public void testTryConvertToReadLock() throws InterruptedException {
799          StampedLock lock = new StampedLock();
800          long s, p;
801  
802 <        assertFalse((p = lock.tryConvertToReadLock(0L)) != 0L);
802 >        assertEquals(0L, lock.tryConvertToReadLock(0L));
803  
804 <        assertTrue((s = lock.tryOptimisticRead()) != 0L);
805 <        assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
804 >        s = assertValid(lock, lock.tryOptimisticRead());
805 >        p = assertValid(lock, lock.tryConvertToReadLock(s));
806          assertTrue(lock.isReadLocked());
807          assertEquals(1, lock.getReadLockCount());
808 +        assertTrue(lock.validate(s));
809          lock.unlockRead(p);
810  
811 <        assertTrue((s = lock.tryOptimisticRead()) != 0L);
811 >        s = assertValid(lock, lock.tryOptimisticRead());
812          lock.readLock();
813 <        assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
813 >        p = assertValid(lock, lock.tryConvertToReadLock(s));
814          assertTrue(lock.isReadLocked());
815          assertEquals(2, lock.getReadLockCount());
816          lock.unlockRead(p);
817          lock.unlockRead(p);
818 +        assertUnlocked(lock);
819  
820 <        assertTrue((s = lock.writeLock()) != 0L);
821 <        assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
822 <        assertTrue(lock.validate(p));
823 <        assertTrue(lock.isReadLocked());
824 <        assertEquals(1, lock.getReadLockCount());
825 <        lock.unlockRead(p);
826 <
827 <        assertTrue((s = lock.readLock()) != 0L);
828 <        assertTrue(lock.validate(s));
829 <        assertEquals(s, lock.tryConvertToReadLock(s));
830 <        assertTrue(lock.validate(s));
831 <        assertTrue(lock.isReadLocked());
832 <        assertEquals(1, lock.getReadLockCount());
833 <        lock.unlockRead(s);
834 <
835 <        assertTrue((s = lock.tryWriteLock()) != 0L);
836 <        assertTrue(lock.validate(s));
837 <        assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
838 <        assertTrue(lock.validate(p));
812 <        assertEquals(1, lock.getReadLockCount());
813 <        lock.unlockRead(p);
814 <
815 <        assertTrue((s = lock.tryReadLock()) != 0L);
816 <        assertTrue(lock.validate(s));
817 <        assertEquals(s, lock.tryConvertToReadLock(s));
818 <        assertTrue(lock.validate(s));
819 <        assertTrue(lock.isReadLocked());
820 <        assertEquals(1, lock.getReadLockCount());
821 <        lock.unlockRead(s);
822 <
823 <        assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
824 <        assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
825 <        assertTrue(lock.validate(p));
826 <        assertTrue(lock.isReadLocked());
827 <        assertEquals(1, lock.getReadLockCount());
828 <        lock.unlockRead(p);
829 <
830 <        assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
831 <        assertTrue(lock.validate(s));
832 <        assertEquals(s, lock.tryConvertToReadLock(s));
833 <        assertTrue(lock.validate(s));
834 <        assertTrue(lock.isReadLocked());
835 <        assertEquals(1, lock.getReadLockCount());
836 <        lock.unlockRead(s);
820 >        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers()) {
821 >            for (Function<StampedLock, Long> writeLocker : writeLockers()) {
822 >                s = assertValid(lock, writeLocker.apply(lock));
823 >                p = assertValid(lock, lock.tryConvertToReadLock(s));
824 >                assertFalse(lock.validate(s));
825 >                assertTrue(lock.isReadLocked());
826 >                assertEquals(1, lock.getReadLockCount());
827 >                readUnlocker.accept(lock, p);
828 >            }
829 >
830 >            for (Function<StampedLock, Long> readLocker : readLockers()) {
831 >                s = assertValid(lock, readLocker.apply(lock));
832 >                assertEquals(s, lock.tryConvertToReadLock(s));
833 >                assertTrue(lock.validate(s));
834 >                assertTrue(lock.isReadLocked());
835 >                assertEquals(1, lock.getReadLockCount());
836 >                readUnlocker.accept(lock, s);
837 >            }
838 >        }
839      }
840  
841      /**
842 <     * tryConvertToWriteLock succeeds and validates if successfully locked
841 <     * or lock free;
842 >     * tryConvertToWriteLock succeeds if lock available; fails if multiply read locked
843       */
844      public void testTryConvertToWriteLock() throws InterruptedException {
845          StampedLock lock = new StampedLock();
846          long s, p;
847  
848 <        assertFalse((p = lock.tryConvertToWriteLock(0L)) != 0L);
848 >        assertEquals(0L, lock.tryConvertToWriteLock(0L));
849  
850          assertTrue((s = lock.tryOptimisticRead()) != 0L);
851          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
852          assertTrue(lock.isWriteLocked());
853          lock.unlockWrite(p);
854  
855 <        assertTrue((s = lock.writeLock()) != 0L);
856 <        assertEquals(s, lock.tryConvertToWriteLock(s));
857 <        assertTrue(lock.validate(s));
858 <        assertTrue(lock.isWriteLocked());
859 <        lock.unlockWrite(s);
860 <
861 <        assertTrue((s = lock.readLock()) != 0L);
862 <        assertTrue(lock.validate(s));
863 <        assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
864 <        assertTrue(lock.validate(p));
865 <        assertTrue(lock.isWriteLocked());
866 <        lock.unlockWrite(p);
867 <
868 <        assertTrue((s = lock.tryWriteLock()) != 0L);
869 <        assertTrue(lock.validate(s));
870 <        assertEquals(s, lock.tryConvertToWriteLock(s));
871 <        assertTrue(lock.validate(s));
872 <        assertTrue(lock.isWriteLocked());
872 <        lock.unlockWrite(s);
873 <
874 <        assertTrue((s = lock.tryReadLock()) != 0L);
875 <        assertTrue(lock.validate(s));
876 <        assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
877 <        assertTrue(lock.validate(p));
878 <        assertTrue(lock.isWriteLocked());
879 <        lock.unlockWrite(p);
880 <
881 <        assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
882 <        assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
883 <        assertTrue(lock.validate(p));
884 <        assertTrue(lock.isWriteLocked());
885 <        lock.unlockWrite(p);
855 >        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers()) {
856 >            for (Function<StampedLock, Long> writeLocker : writeLockers()) {
857 >                s = assertValid(lock, writeLocker.apply(lock));
858 >                assertEquals(s, lock.tryConvertToWriteLock(s));
859 >                assertTrue(lock.validate(s));
860 >                assertTrue(lock.isWriteLocked());
861 >                writeUnlocker.accept(lock, s);
862 >            }
863 >
864 >            for (Function<StampedLock, Long> readLocker : readLockers()) {
865 >                s = assertValid(lock, readLocker.apply(lock));
866 >                p = assertValid(lock, lock.tryConvertToWriteLock(s));
867 >                assertFalse(lock.validate(s));
868 >                assertTrue(lock.validate(p));
869 >                assertTrue(lock.isWriteLocked());
870 >                writeUnlocker.accept(lock, p);
871 >            }
872 >        }
873  
874 <        assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
875 <        assertTrue(lock.validate(s));
876 <        assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
877 <        assertTrue(lock.validate(p));
878 <        assertTrue(lock.isWriteLocked());
879 <        lock.unlockWrite(p);
874 >        // failure if multiply read locked
875 >        for (Function<StampedLock, Long> readLocker : readLockers()) {
876 >            s = assertValid(lock, readLocker.apply(lock));
877 >            p = assertValid(lock, readLocker.apply(lock));
878 >            assertEquals(0L, lock.tryConvertToWriteLock(s));
879 >            assertTrue(lock.validate(s));
880 >            assertTrue(lock.validate(p));
881 >            assertEquals(2, lock.getReadLockCount());
882 >            lock.unlock(p);
883 >            lock.unlock(s);
884 >            assertUnlocked(lock);
885 >        }
886      }
887  
888      /**
889       * asWriteLock can be locked and unlocked
890       */
891 <    public void testAsWriteLock() {
891 >    public void testAsWriteLock() throws Throwable {
892          StampedLock sl = new StampedLock();
893          Lock lock = sl.asWriteLock();
894 <        lock.lock();
895 <        assertFalse(lock.tryLock());
896 <        lock.unlock();
897 <        assertTrue(lock.tryLock());
894 >        for (Action locker : lockLockers(lock)) {
895 >            locker.run();
896 >            assertTrue(sl.isWriteLocked());
897 >            assertFalse(sl.isReadLocked());
898 >            assertFalse(lock.tryLock());
899 >            lock.unlock();
900 >            assertUnlocked(sl);
901 >        }
902      }
903  
904      /**
905       * asReadLock can be locked and unlocked
906       */
907 <    public void testAsReadLock() {
907 >    public void testAsReadLock() throws Throwable {
908          StampedLock sl = new StampedLock();
909          Lock lock = sl.asReadLock();
910 <        lock.lock();
911 <        lock.unlock();
912 <        assertTrue(lock.tryLock());
910 >        for (Action locker : lockLockers(lock)) {
911 >            locker.run();
912 >            assertTrue(sl.isReadLocked());
913 >            assertFalse(sl.isWriteLocked());
914 >            assertEquals(1, sl.getReadLockCount());
915 >            locker.run();
916 >            assertTrue(sl.isReadLocked());
917 >            assertEquals(2, sl.getReadLockCount());
918 >            lock.unlock();
919 >            lock.unlock();
920 >            assertUnlocked(sl);
921 >        }
922      }
923  
924      /**
925       * asReadWriteLock.writeLock can be locked and unlocked
926       */
927 <    public void testAsReadWriteLockWriteLock() {
927 >    public void testAsReadWriteLockWriteLock() throws Throwable {
928          StampedLock sl = new StampedLock();
929          Lock lock = sl.asReadWriteLock().writeLock();
930 <        lock.lock();
931 <        assertFalse(lock.tryLock());
932 <        lock.unlock();
933 <        assertTrue(lock.tryLock());
930 >        for (Action locker : lockLockers(lock)) {
931 >            locker.run();
932 >            assertTrue(sl.isWriteLocked());
933 >            assertFalse(sl.isReadLocked());
934 >            assertFalse(lock.tryLock());
935 >            lock.unlock();
936 >            assertUnlocked(sl);
937 >        }
938      }
939  
940      /**
941       * asReadWriteLock.readLock can be locked and unlocked
942       */
943 <    public void testAsReadWriteLockReadLock() {
943 >    public void testAsReadWriteLockReadLock() throws Throwable {
944          StampedLock sl = new StampedLock();
945          Lock lock = sl.asReadWriteLock().readLock();
946 <        lock.lock();
947 <        lock.unlock();
948 <        assertTrue(lock.tryLock());
946 >        for (Action locker : lockLockers(lock)) {
947 >            locker.run();
948 >            assertTrue(sl.isReadLocked());
949 >            assertFalse(sl.isWriteLocked());
950 >            assertEquals(1, sl.getReadLockCount());
951 >            locker.run();
952 >            assertTrue(sl.isReadLocked());
953 >            assertEquals(2, sl.getReadLockCount());
954 >            lock.unlock();
955 >            lock.unlock();
956 >            assertUnlocked(sl);
957 >        }
958      }
959  
960      /**
# Line 958 | Line 977 | public class StampedLockTest extends JSR
977          Runnable[] actions = {
978              () -> {
979                  StampedLock sl = new StampedLock();
980 <                long stamp = sl.tryOptimisticRead();
962 <                assertTrue(stamp != 0);
980 >                long stamp = assertValid(sl, sl.tryOptimisticRead());
981                  sl.unlockRead(stamp);
982              },
983              () -> {
# Line 976 | Line 994 | public class StampedLockTest extends JSR
994              },
995              () -> {
996                  StampedLock sl = new StampedLock();
979                long stamp = sl.tryOptimisticRead();
997                  sl.readLock();
998 +                long stamp = assertValid(sl, sl.tryOptimisticRead());
999                  sl.unlockRead(stamp);
1000              },
1001              () -> {
1002                  StampedLock sl = new StampedLock();
985                long stamp = sl.tryOptimisticRead();
1003                  sl.readLock();
1004 +                long stamp = assertValid(sl, sl.tryOptimisticRead());
1005                  sl.unlock(stamp);
1006              },
1007  
1008              () -> {
1009                  StampedLock sl = new StampedLock();
1010                  long stamp = sl.tryConvertToOptimisticRead(sl.writeLock());
1011 <                assertTrue(stamp != 0);
1011 >                assertValid(sl, stamp);
1012                  sl.writeLock();
1013                  sl.unlockWrite(stamp);
1014              },
# Line 1016 | Line 1034 | public class StampedLockTest extends JSR
1034              () -> {
1035                  StampedLock sl = new StampedLock();
1036                  long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
1037 <                assertTrue(stamp != 0);
1037 >                assertValid(sl, stamp);
1038                  sl.writeLock();
1039                  sl.unlockWrite(stamp);
1040              },
# Line 1036 | Line 1054 | public class StampedLockTest extends JSR
1054                  StampedLock sl = new StampedLock();
1055                  sl.readLock();
1056                  long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
1057 <                assertTrue(stamp != 0);
1057 >                assertValid(sl, stamp);
1058                  sl.readLock();
1059                  sl.unlockRead(stamp);
1060              },
# Line 1079 | Line 1097 | public class StampedLockTest extends JSR
1097      }
1098  
1099      /**
1100 <     * Invalid write stamps result in IllegalMonitorStateException
1100 >     * Invalid stamps result in IllegalMonitorStateException
1101       */
1102 <    public void testInvalidWriteStampsThrowIllegalMonitorStateException() {
1103 <        List<Function<StampedLock, Long>> writeLockers = new ArrayList<>();
1086 <        writeLockers.add((sl) -> sl.writeLock());
1087 <        writeLockers.add((sl) -> writeLockInterruptiblyUninterrupted(sl));
1088 <        writeLockers.add((sl) -> tryWriteLockUninterrupted(sl, Long.MIN_VALUE, DAYS));
1089 <        writeLockers.add((sl) -> tryWriteLockUninterrupted(sl, 0, DAYS));
1102 >    public void testInvalidStampsThrowIllegalMonitorStateException() {
1103 >        final StampedLock sl = new StampedLock();
1104  
1105 <        List<BiConsumer<StampedLock, Long>> writeUnlockers = new ArrayList<>();
1106 <        writeUnlockers.add((sl, stamp) -> sl.unlockWrite(stamp));
1107 <        writeUnlockers.add((sl, stamp) -> assertTrue(sl.tryUnlockWrite()));
1108 <        writeUnlockers.add((sl, stamp) -> sl.asWriteLock().unlock());
1109 <        writeUnlockers.add((sl, stamp) -> sl.unlock(stamp));
1105 >        assertThrows(IllegalMonitorStateException.class,
1106 >                     () -> sl.unlockWrite(0L),
1107 >                     () -> sl.unlockRead(0L),
1108 >                     () -> sl.unlock(0L));
1109 >
1110 >        final long optimisticStamp = sl.tryOptimisticRead();
1111 >        final long readStamp = sl.readLock();
1112 >        sl.unlockRead(readStamp);
1113 >        final long writeStamp = sl.writeLock();
1114 >        sl.unlockWrite(writeStamp);
1115 >        assertTrue(optimisticStamp != 0L && readStamp != 0L && writeStamp != 0L);
1116 >        final long[] noLongerValidStamps = { optimisticStamp, readStamp, writeStamp };
1117 >        final Runnable assertNoLongerValidStampsThrow = () -> {
1118 >            for (long noLongerValidStamp : noLongerValidStamps)
1119 >                assertThrows(IllegalMonitorStateException.class,
1120 >                             () -> sl.unlockWrite(noLongerValidStamp),
1121 >                             () -> sl.unlockRead(noLongerValidStamp),
1122 >                             () -> sl.unlock(noLongerValidStamp));
1123 >        };
1124 >        assertNoLongerValidStampsThrow.run();
1125  
1126 <        List<Consumer<StampedLock>> mutaters = new ArrayList<>();
1127 <        mutaters.add((sl) -> {});
1128 <        mutaters.add((sl) -> sl.readLock());
1129 <        for (Function<StampedLock, Long> writeLocker : writeLockers)
1130 <            mutaters.add((sl) -> writeLocker.apply(sl));
1102 <
1103 <        for (Function<StampedLock, Long> writeLocker : writeLockers)
1104 <        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers)
1105 <        for (Consumer<StampedLock> mutater : mutaters) {
1106 <            final StampedLock sl = new StampedLock();
1107 <            final long stamp = writeLocker.apply(sl);
1108 <            assertTrue(stamp != 0L);
1126 >        for (Function<StampedLock, Long> readLocker : readLockers())
1127 >        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers()) {
1128 >            final long stamp = readLocker.apply(sl);
1129 >            assertValid(sl, stamp);
1130 >            assertNoLongerValidStampsThrow.run();
1131              assertThrows(IllegalMonitorStateException.class,
1132 <                         () -> sl.unlockRead(stamp));
1133 <            writeUnlocker.accept(sl, stamp);
1134 <            mutater.accept(sl);
1132 >                         () -> sl.unlockWrite(stamp),
1133 >                         () -> sl.unlockRead(sl.tryOptimisticRead()),
1134 >                         () -> sl.unlockRead(0L));
1135 >            readUnlocker.accept(sl, stamp);
1136 >            assertUnlocked(sl);
1137 >            assertNoLongerValidStampsThrow.run();
1138 >        }
1139 >
1140 >        for (Function<StampedLock, Long> writeLocker : writeLockers())
1141 >        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers()) {
1142 >            final long stamp = writeLocker.apply(sl);
1143 >            assertValid(sl, stamp);
1144 >            assertNoLongerValidStampsThrow.run();
1145              assertThrows(IllegalMonitorStateException.class,
1114                         () -> sl.unlock(stamp),
1146                           () -> sl.unlockRead(stamp),
1147 <                         () -> sl.unlockWrite(stamp));
1147 >                         () -> sl.unlockWrite(0L));
1148 >            writeUnlocker.accept(sl, stamp);
1149 >            assertUnlocked(sl);
1150 >            assertNoLongerValidStampsThrow.run();
1151          }
1152      }
1153  
1154      /**
1155 <     * Invalid read stamps result in IllegalMonitorStateException
1155 >     * Read locks can be very deeply nested
1156       */
1157 <    public void testInvalidReadStampsThrowIllegalMonitorStateException() {
1158 <        List<Function<StampedLock, Long>> readLockers = new ArrayList<>();
1159 <        readLockers.add((sl) -> sl.readLock());
1160 <        readLockers.add((sl) -> readLockInterruptiblyUninterrupted(sl));
1161 <        readLockers.add((sl) -> tryReadLockUninterrupted(sl, Long.MIN_VALUE, DAYS));
1162 <        readLockers.add((sl) -> tryReadLockUninterrupted(sl, 0, DAYS));
1163 <
1164 <        List<BiConsumer<StampedLock, Long>> readUnlockers = new ArrayList<>();
1165 <        readUnlockers.add((sl, stamp) -> sl.unlockRead(stamp));
1166 <        readUnlockers.add((sl, stamp) -> assertTrue(sl.tryUnlockRead()));
1167 <        readUnlockers.add((sl, stamp) -> sl.asReadLock().unlock());
1168 <        readUnlockers.add((sl, stamp) -> sl.unlock(stamp));
1169 <
1170 <        List<Function<StampedLock, Long>> writeLockers = new ArrayList<>();
1171 <        writeLockers.add((sl) -> sl.writeLock());
1172 <        writeLockers.add((sl) -> writeLockInterruptiblyUninterrupted(sl));
1173 <        writeLockers.add((sl) -> tryWriteLockUninterrupted(sl, Long.MIN_VALUE, DAYS));
1174 <        writeLockers.add((sl) -> tryWriteLockUninterrupted(sl, 0, DAYS));
1175 <
1176 <        List<BiConsumer<StampedLock, Long>> writeUnlockers = new ArrayList<>();
1143 <        writeUnlockers.add((sl, stamp) -> sl.unlockWrite(stamp));
1144 <        writeUnlockers.add((sl, stamp) -> assertTrue(sl.tryUnlockWrite()));
1145 <        writeUnlockers.add((sl, stamp) -> sl.asWriteLock().unlock());
1146 <        writeUnlockers.add((sl, stamp) -> sl.unlock(stamp));
1147 <
1148 <
1149 <        for (Function<StampedLock, Long> readLocker : readLockers)
1150 <        for (BiConsumer<StampedLock, Long> readUnlocker : readUnlockers)
1151 <        for (Function<StampedLock, Long> writeLocker : writeLockers)
1152 <        for (BiConsumer<StampedLock, Long> writeUnlocker : writeUnlockers) {
1153 <            final StampedLock sl = new StampedLock();
1154 <            final long stamp = readLocker.apply(sl);
1155 <            assertTrue(stamp != 0L);
1156 <            assertThrows(IllegalMonitorStateException.class,
1157 <                         () -> sl.unlockWrite(stamp));
1158 <            readUnlocker.accept(sl, stamp);
1159 <            assertThrows(IllegalMonitorStateException.class,
1160 <                         () -> sl.unlock(stamp),
1161 <                         () -> sl.unlockRead(stamp),
1162 <                         () -> sl.unlockWrite(stamp));
1163 <            final long writeStamp = writeLocker.apply(sl);
1164 <            assertTrue(writeStamp != 0L);
1165 <            assertTrue(writeStamp != stamp);
1166 <            assertThrows(IllegalMonitorStateException.class,
1167 <                         () -> sl.unlock(stamp),
1168 <                         () -> sl.unlockRead(stamp),
1169 <                         () -> sl.unlockWrite(stamp));
1170 <            writeUnlocker.accept(sl, writeStamp);
1171 <            assertThrows(IllegalMonitorStateException.class,
1172 <                         () -> sl.unlock(stamp),
1173 <                         () -> sl.unlockRead(stamp),
1174 <                         () -> sl.unlockWrite(stamp));
1157 >    public void testDeeplyNestedReadLocks() {
1158 >        final StampedLock lock = new StampedLock();
1159 >        final int depth = 300;
1160 >        final long[] stamps = new long[depth];
1161 >        final List<Function<StampedLock, Long>> readLockers = readLockers();
1162 >        final List<BiConsumer<StampedLock, Long>> readUnlockers = readUnlockers();
1163 >        for (int i = 0; i < depth; i++) {
1164 >            Function<StampedLock, Long> readLocker
1165 >                = readLockers.get(i % readLockers.size());
1166 >            long stamp = readLocker.apply(lock);
1167 >            assertEquals(i + 1, lock.getReadLockCount());
1168 >            assertTrue(lock.isReadLocked());
1169 >            stamps[i] = stamp;
1170 >        }
1171 >        for (int i = 0; i < depth; i++) {
1172 >            BiConsumer<StampedLock, Long> readUnlocker
1173 >                = readUnlockers.get(i % readUnlockers.size());
1174 >            assertEquals(depth - i, lock.getReadLockCount());
1175 >            assertTrue(lock.isReadLocked());
1176 >            readUnlocker.accept(lock, stamps[depth - 1 - i]);
1177          }
1178 +        assertUnlocked(lock);
1179      }
1177
1180   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines