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

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.34 by jsr166, Tue Nov 17 14:45:32 2009 UTC vs.
Revision 1.59 by jsr166, Sat May 7 19:03:26 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10 + import java.util.concurrent.atomic.AtomicBoolean;
11   import java.util.concurrent.locks.*;
12   import java.util.concurrent.*;
13 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
14   import java.io.*;
15   import java.util.*;
16  
17   public class ReentrantReadWriteLockTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run (suite());
19 >        junit.textui.TestRunner.run(suite());
20      }
21      public static Test suite() {
22 <        return new TestSuite(ReentrantReadWriteLockTest.class);
22 >        return new TestSuite(ReentrantReadWriteLockTest.class);
23      }
24  
25      /**
# Line 31 | Line 33 | public class ReentrantReadWriteLockTest
33          }
34      }
35  
34
36      /**
37       * A runnable calling lockInterruptibly that expects to be
38       * interrupted
# Line 49 | Line 50 | public class ReentrantReadWriteLockTest
50       */
51      static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
52          PublicReentrantReadWriteLock() { super(); }
53 +        PublicReentrantReadWriteLock(boolean fair) { super(fair); }
54 +        public Thread getOwner() {
55 +            return super.getOwner();
56 +        }
57          public Collection<Thread> getQueuedThreads() {
58              return super.getQueuedThreads();
59          }
# Line 58 | Line 63 | public class ReentrantReadWriteLockTest
63      }
64  
65      /**
66 +     * Releases write lock, checking that it had a hold count of 1.
67 +     */
68 +    void releaseWriteLock(PublicReentrantReadWriteLock lock) {
69 +        ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
70 +        assertWriteLockedBy(lock, Thread.currentThread());
71 +        assertEquals(1, lock.getWriteHoldCount());
72 +        writeLock.unlock();
73 +        assertNotWriteLocked(lock);
74 +    }
75 +
76 +    /**
77 +     * Spin-waits until lock.hasQueuedThread(t) becomes true.
78 +     */
79 +    void waitForQueuedThread(PublicReentrantReadWriteLock lock, Thread t) {
80 +        long startTime = System.nanoTime();
81 +        while (!lock.hasQueuedThread(t)) {
82 +            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
83 +                throw new AssertionError("timed out");
84 +            Thread.yield();
85 +        }
86 +        assertTrue(t.isAlive());
87 +        assertTrue(lock.getOwner() != t);
88 +    }
89 +
90 +    /**
91 +     * Checks that lock is not write-locked.
92 +     */
93 +    void assertNotWriteLocked(PublicReentrantReadWriteLock lock) {
94 +        assertFalse(lock.isWriteLocked());
95 +        assertFalse(lock.isWriteLockedByCurrentThread());
96 +        assertFalse(lock.writeLock().isHeldByCurrentThread());
97 +        assertNull(lock.getOwner());
98 +        assertEquals(0, lock.getWriteHoldCount());
99 +    }
100 +
101 +    /**
102 +     * Checks that lock is write-locked by the given thread.
103 +     */
104 +    void assertWriteLockedBy(PublicReentrantReadWriteLock lock, Thread t) {
105 +        assertTrue(lock.isWriteLocked());
106 +        assertSame(t, lock.getOwner());
107 +        assertEquals(t == Thread.currentThread(),
108 +                     lock.isWriteLockedByCurrentThread());
109 +        assertEquals(t == Thread.currentThread(),
110 +                     lock.writeLock().isHeldByCurrentThread());
111 +        assertEquals(t == Thread.currentThread(),
112 +                     lock.getWriteHoldCount() > 0);
113 +        assertEquals(0, lock.getReadLockCount());
114 +    }
115 +
116 +    /**
117 +     * Checks that condition c has no waiters.
118 +     */
119 +    void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
120 +        assertHasWaiters(lock, c, new Thread[] {});
121 +    }
122 +
123 +    /**
124 +     * Checks that condition c has exactly the given waiter threads.
125 +     */
126 +    void assertHasWaiters(PublicReentrantReadWriteLock lock, Condition c,
127 +                          Thread... threads) {
128 +        lock.writeLock().lock();
129 +        assertEquals(threads.length > 0, lock.hasWaiters(c));
130 +        assertEquals(threads.length, lock.getWaitQueueLength(c));
131 +        assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
132 +        assertEquals(threads.length, lock.getWaitingThreads(c).size());
133 +        assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
134 +                     new HashSet<Thread>(Arrays.asList(threads)));
135 +        lock.writeLock().unlock();
136 +    }
137 +
138 +    /**
139       * Constructor sets given fairness, and is in unlocked state
140       */
141      public void testConstructor() {
142 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
143 <        assertFalse(rl.isFair());
144 <        assertFalse(rl.isWriteLocked());
145 <        assertEquals(0, rl.getReadLockCount());
146 <        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
147 <        assertTrue(r2.isFair());
148 <        assertFalse(r2.isWriteLocked());
149 <        assertEquals(0, r2.getReadLockCount());
150 <        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
151 <        assertFalse(r3.isFair());
152 <        assertFalse(r3.isWriteLocked());
153 <        assertEquals(0, r3.getReadLockCount());
142 >        PublicReentrantReadWriteLock lock;
143 >
144 >        lock = new PublicReentrantReadWriteLock();
145 >        assertFalse(lock.isFair());
146 >        assertNotWriteLocked(lock);
147 >        assertEquals(0, lock.getReadLockCount());
148 >
149 >        lock = new PublicReentrantReadWriteLock(true);
150 >        assertTrue(lock.isFair());
151 >        assertNotWriteLocked(lock);
152 >        assertEquals(0, lock.getReadLockCount());
153 >
154 >        lock = new PublicReentrantReadWriteLock(false);
155 >        assertFalse(lock.isFair());
156 >        assertNotWriteLocked(lock);
157 >        assertEquals(0, lock.getReadLockCount());
158      }
159  
160      /**
161       * write-locking and read-locking an unlocked lock succeed
162       */
163      public void testLock() {
164 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
165 <        rl.writeLock().lock();
166 <        assertTrue(rl.isWriteLocked());
167 <        assertTrue(rl.isWriteLockedByCurrentThread());
168 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
169 <        assertEquals(0, rl.getReadLockCount());
170 <        rl.writeLock().unlock();
171 <        assertFalse(rl.isWriteLocked());
172 <        assertFalse(rl.isWriteLockedByCurrentThread());
173 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
174 <        assertEquals(0, rl.getReadLockCount());
175 <        rl.readLock().lock();
176 <        assertFalse(rl.isWriteLocked());
95 <        assertFalse(rl.isWriteLockedByCurrentThread());
96 <        assertEquals(1, rl.getReadLockCount());
97 <        rl.readLock().unlock();
98 <        assertFalse(rl.isWriteLocked());
99 <        assertFalse(rl.isWriteLockedByCurrentThread());
100 <        assertEquals(0, rl.getReadLockCount());
164 >        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
165 >        assertNotWriteLocked(lock);
166 >        lock.writeLock().lock();
167 >        assertWriteLockedBy(lock, Thread.currentThread());
168 >        lock.writeLock().unlock();
169 >        assertNotWriteLocked(lock);
170 >        assertEquals(0, lock.getReadLockCount());
171 >        lock.readLock().lock();
172 >        assertNotWriteLocked(lock);
173 >        assertEquals(1, lock.getReadLockCount());
174 >        lock.readLock().unlock();
175 >        assertNotWriteLocked(lock);
176 >        assertEquals(0, lock.getReadLockCount());
177      }
178  
103
179      /**
180       * locking an unlocked fair lock succeeds
181       */
182      public void testFairLock() {
183 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
184 <        rl.writeLock().lock();
185 <        assertTrue(rl.isWriteLocked());
186 <        assertTrue(rl.isWriteLockedByCurrentThread());
187 <        assertTrue(rl.writeLock().isHeldByCurrentThread());
188 <        assertEquals(0, rl.getReadLockCount());
189 <        rl.writeLock().unlock();
190 <        assertFalse(rl.isWriteLocked());
191 <        assertFalse(rl.isWriteLockedByCurrentThread());
192 <        assertFalse(rl.writeLock().isHeldByCurrentThread());
193 <        assertEquals(0, rl.getReadLockCount());
194 <        rl.readLock().lock();
195 <        assertFalse(rl.isWriteLocked());
121 <        assertFalse(rl.isWriteLockedByCurrentThread());
122 <        assertEquals(1, rl.getReadLockCount());
123 <        rl.readLock().unlock();
124 <        assertFalse(rl.isWriteLocked());
125 <        assertFalse(rl.isWriteLockedByCurrentThread());
126 <        assertEquals(0, rl.getReadLockCount());
183 >        PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
184 >        assertNotWriteLocked(lock);
185 >        lock.writeLock().lock();
186 >        assertWriteLockedBy(lock, Thread.currentThread());
187 >        lock.writeLock().unlock();
188 >        assertNotWriteLocked(lock);
189 >        assertEquals(0, lock.getReadLockCount());
190 >        lock.readLock().lock();
191 >        assertNotWriteLocked(lock);
192 >        assertEquals(1, lock.getReadLockCount());
193 >        lock.readLock().unlock();
194 >        assertNotWriteLocked(lock);
195 >        assertEquals(0, lock.getReadLockCount());
196      }
197  
198      /**
199       * getWriteHoldCount returns number of recursive holds
200       */
201      public void testGetWriteHoldCount() {
202 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
203 <        for (int i = 1; i <= SIZE; i++) {
204 <            lock.writeLock().lock();
205 <            assertEquals(i,lock.getWriteHoldCount());
206 <        }
207 <        for (int i = SIZE; i > 0; i--) {
208 <            lock.writeLock().unlock();
209 <            assertEquals(i-1,lock.getWriteHoldCount());
210 <        }
202 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
203 >        for (int i = 1; i <= SIZE; i++) {
204 >            lock.writeLock().lock();
205 >            assertEquals(i,lock.getWriteHoldCount());
206 >        }
207 >        for (int i = SIZE; i > 0; i--) {
208 >            lock.writeLock().unlock();
209 >            assertEquals(i-1,lock.getWriteHoldCount());
210 >        }
211      }
212  
213      /**
214       * WriteLock.getHoldCount returns number of recursive holds
215       */
216      public void testGetHoldCount() {
217 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
218 <        for (int i = 1; i <= SIZE; i++) {
219 <            lock.writeLock().lock();
220 <            assertEquals(i,lock.writeLock().getHoldCount());
221 <        }
222 <        for (int i = SIZE; i > 0; i--) {
223 <            lock.writeLock().unlock();
224 <            assertEquals(i-1,lock.writeLock().getHoldCount());
225 <        }
217 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
218 >        for (int i = 1; i <= SIZE; i++) {
219 >            lock.writeLock().lock();
220 >            assertEquals(i,lock.writeLock().getHoldCount());
221 >        }
222 >        for (int i = SIZE; i > 0; i--) {
223 >            lock.writeLock().unlock();
224 >            assertEquals(i-1,lock.writeLock().getHoldCount());
225 >        }
226      }
227  
228      /**
229       * getReadHoldCount returns number of recursive holds
230       */
231      public void testGetReadHoldCount() {
232 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
233 <        for (int i = 1; i <= SIZE; i++) {
234 <            lock.readLock().lock();
235 <            assertEquals(i,lock.getReadHoldCount());
236 <        }
237 <        for (int i = SIZE; i > 0; i--) {
238 <            lock.readLock().unlock();
239 <            assertEquals(i-1,lock.getReadHoldCount());
240 <        }
232 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
233 >        for (int i = 1; i <= SIZE; i++) {
234 >            lock.readLock().lock();
235 >            assertEquals(i,lock.getReadHoldCount());
236 >        }
237 >        for (int i = SIZE; i > 0; i--) {
238 >            lock.readLock().unlock();
239 >            assertEquals(i-1,lock.getReadHoldCount());
240 >        }
241      }
242  
174
243      /**
244       * write-unlocking an unlocked lock throws IllegalMonitorStateException
245       */
246 <    public void testUnlock_IllegalMonitorStateException() {
247 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
248 <        try {
249 <            rl.writeLock().unlock();
250 <            shouldThrow();
251 <        } catch (IllegalMonitorStateException success) {}
246 >    public void testWriteUnlock_IllegalMonitorStateException() {
247 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
248 >        try {
249 >            lock.writeLock().unlock();
250 >            shouldThrow();
251 >        } catch (IllegalMonitorStateException success) {}
252      }
253  
254 +    /**
255 +     * read-unlocking an unlocked lock throws IllegalMonitorStateException
256 +     */
257 +    public void testReadUnlock_IllegalMonitorStateException() {
258 +        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
259 +        try {
260 +            lock.readLock().unlock();
261 +            shouldThrow();
262 +        } catch (IllegalMonitorStateException success) {}
263 +    }
264  
265      /**
266       * write-lockInterruptibly is interruptible
267       */
268      public void testWriteLockInterruptibly_Interrupted() throws Exception {
269 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
270 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
269 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
270 >        lock.writeLock().lock();
271 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
272              public void realRun() throws InterruptedException {
273                  lock.writeLock().lockInterruptibly();
195                lock.writeLock().unlock();
196                lock.writeLock().lockInterruptibly();
197                lock.writeLock().unlock();
274              }});
275  
276 <        lock.writeLock().lock();
201 <        t.start();
202 <        Thread.sleep(SHORT_DELAY_MS);
276 >        waitForQueuedThread(lock, t);
277          t.interrupt();
278 <        Thread.sleep(SHORT_DELAY_MS);
279 <        lock.writeLock().unlock();
206 <        t.join();
278 >        awaitTermination(t);
279 >        releaseWriteLock(lock);
280      }
281  
282      /**
283       * timed write-tryLock is interruptible
284       */
285      public void testWriteTryLock_Interrupted() throws InterruptedException {
286 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
287 <        lock.writeLock().lock();
288 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
286 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
287 >        lock.writeLock().lock();
288 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
289              public void realRun() throws InterruptedException {
290 <                lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
290 >                lock.writeLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
291              }});
292  
293 <        t.start();
293 >        waitForQueuedThread(lock, t);
294          t.interrupt();
295 <        lock.writeLock().unlock();
296 <        t.join();
295 >        awaitTermination(t);
296 >        releaseWriteLock(lock);
297      }
298  
299      /**
300       * read-lockInterruptibly is interruptible
301       */
302      public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
303 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
304 <        lock.writeLock().lock();
305 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
303 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
304 >        lock.writeLock().lock();
305 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
306              public void realRun() throws InterruptedException {
307                  lock.readLock().lockInterruptibly();
308              }});
309  
310 <        t.start();
238 <        Thread.sleep(SHORT_DELAY_MS);
310 >        waitForQueuedThread(lock, t);
311          t.interrupt();
312 <        Thread.sleep(SHORT_DELAY_MS);
313 <        lock.writeLock().unlock();
242 <        t.join();
312 >        awaitTermination(t);
313 >        releaseWriteLock(lock);
314      }
315  
316      /**
317       * timed read-tryLock is interruptible
318       */
319      public void testReadTryLock_Interrupted() throws InterruptedException {
320 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
321 <        lock.writeLock().lock();
322 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
320 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
321 >        lock.writeLock().lock();
322 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
323              public void realRun() throws InterruptedException {
324 <                lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
324 >                lock.readLock().tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
325              }});
326  
327 <        t.start();
327 >        waitForQueuedThread(lock, t);
328          t.interrupt();
329 <        t.join();
329 >        awaitTermination(t);
330 >        releaseWriteLock(lock);
331      }
332  
261
333      /**
334       * write-tryLock fails if locked
335       */
336      public void testWriteTryLockWhenLocked() throws InterruptedException {
337 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
338 <        lock.writeLock().lock();
339 <        Thread t = new Thread(new Runnable() {
340 <                public void run() {
341 <                    threadAssertFalse(lock.writeLock().tryLock());
342 <                }
272 <            });
337 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
338 >        lock.writeLock().lock();
339 >        Thread t = newStartedThread(new CheckedRunnable() {
340 >            public void realRun() {
341 >                assertFalse(lock.writeLock().tryLock());
342 >            }});
343  
344 <        t.start();
345 <        t.join();
276 <        lock.writeLock().unlock();
344 >        awaitTermination(t);
345 >        releaseWriteLock(lock);
346      }
347  
348      /**
349       * read-tryLock fails if locked
350       */
351      public void testReadTryLockWhenLocked() throws InterruptedException {
352 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
353 <        lock.writeLock().lock();
354 <        Thread t = new Thread(new Runnable() {
355 <                public void run() {
356 <                    threadAssertFalse(lock.readLock().tryLock());
357 <                }
289 <            });
352 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
353 >        lock.writeLock().lock();
354 >        Thread t = newStartedThread(new CheckedRunnable() {
355 >            public void realRun() {
356 >                assertFalse(lock.readLock().tryLock());
357 >            }});
358  
359 <        t.start();
360 <        t.join();
293 <        lock.writeLock().unlock();
359 >        awaitTermination(t);
360 >        releaseWriteLock(lock);
361      }
362  
363      /**
364       * Multiple threads can hold a read lock when not write-locked
365       */
366      public void testMultipleReadLocks() throws InterruptedException {
367 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
368 <        lock.readLock().lock();
369 <        Thread t = new Thread(new Runnable() {
370 <                public void run() {
371 <                    threadAssertTrue(lock.readLock().tryLock());
372 <                    lock.readLock().unlock();
373 <                }
374 <            });
367 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
368 >        lock.readLock().lock();
369 >        Thread t = newStartedThread(new CheckedRunnable() {
370 >            public void realRun() {
371 >                assertTrue(lock.readLock().tryLock());
372 >                lock.readLock().unlock();
373 >            }});
374 >
375 >        awaitTermination(t);
376 >        lock.readLock().unlock();
377 >    }
378  
379 <        t.start();
380 <        t.join();
379 >    /**
380 >     * A writelock succeeds only after a reading thread unlocks
381 >     */
382 >    public void testWriteAfterReadLock() throws InterruptedException {
383 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
384 >        lock.readLock().lock();
385 >
386 >        Thread t = newStartedThread(new CheckedRunnable() {
387 >            public void realRun() {
388 >                assertEquals(1, lock.getReadLockCount());
389 >                lock.writeLock().lock();
390 >                assertEquals(0, lock.getReadLockCount());
391 >                lock.writeLock().unlock();
392 >            }});
393 >        waitForQueuedThread(lock, t);
394 >        assertNotWriteLocked(lock);
395 >        assertEquals(1, lock.getReadLockCount());
396          lock.readLock().unlock();
397 +        assertEquals(0, lock.getReadLockCount());
398 +        awaitTermination(t);
399 +        assertNotWriteLocked(lock);
400      }
401  
402      /**
403 <     * A writelock succeeds after reading threads unlock
403 >     * A writelock succeeds only after reading threads unlock
404       */
405      public void testWriteAfterMultipleReadLocks() throws InterruptedException {
406 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
407 <        lock.readLock().lock();
408 <        Thread t1 = new Thread(new Runnable() {
409 <                public void run() {
410 <                    lock.readLock().lock();
411 <                    lock.readLock().unlock();
412 <                }
413 <            });
414 <        Thread t2 = new Thread(new Runnable() {
415 <                public void run() {
328 <                    lock.writeLock().lock();
329 <                    lock.writeLock().unlock();
330 <                }
331 <            });
406 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
407 >        lock.readLock().lock();
408 >        lock.readLock().lock();
409 >        Thread t1 = newStartedThread(new CheckedRunnable() {
410 >            public void realRun() {
411 >                lock.readLock().lock();
412 >                assertEquals(3, lock.getReadLockCount());
413 >                lock.readLock().unlock();
414 >            }});
415 >        awaitTermination(t1);
416  
417 <        t1.start();
418 <        t2.start();
419 <        Thread.sleep(SHORT_DELAY_MS);
417 >        Thread t2 = newStartedThread(new CheckedRunnable() {
418 >            public void realRun() {
419 >                assertEquals(2, lock.getReadLockCount());
420 >                lock.writeLock().lock();
421 >                assertEquals(0, lock.getReadLockCount());
422 >                lock.writeLock().unlock();
423 >            }});
424 >        waitForQueuedThread(lock, t2);
425 >        assertNotWriteLocked(lock);
426 >        assertEquals(2, lock.getReadLockCount());
427 >        lock.readLock().unlock();
428 >        lock.readLock().unlock();
429 >        assertEquals(0, lock.getReadLockCount());
430 >        awaitTermination(t2);
431 >        assertNotWriteLocked(lock);
432 >    }
433 >
434 >    /**
435 >     * A thread that tries to acquire a fair read lock (non-reentrantly)
436 >     * will block if there is a waiting writer thread.
437 >     */
438 >    public void testReaderWriterReaderFairFifo() throws InterruptedException {
439 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
440 >        final AtomicBoolean t1GotLock = new AtomicBoolean(false);
441 >
442 >        lock.readLock().lock();
443 >        Thread t1 = newStartedThread(new CheckedRunnable() {
444 >            public void realRun() {
445 >                assertEquals(1, lock.getReadLockCount());
446 >                lock.writeLock().lock();
447 >                assertEquals(0, lock.getReadLockCount());
448 >                t1GotLock.set(true);
449 >                lock.writeLock().unlock();
450 >            }});
451 >        waitForQueuedThread(lock, t1);
452 >
453 >        Thread t2 = newStartedThread(new CheckedRunnable() {
454 >            public void realRun() {
455 >                assertEquals(1, lock.getReadLockCount());
456 >                lock.readLock().lock();
457 >                assertEquals(1, lock.getReadLockCount());
458 >                assertTrue(t1GotLock.get());
459 >                lock.readLock().unlock();
460 >            }});
461 >        waitForQueuedThread(lock, t2);
462 >        assertTrue(t1.isAlive());
463 >        assertNotWriteLocked(lock);
464 >        assertEquals(1, lock.getReadLockCount());
465          lock.readLock().unlock();
466 <        t1.join(MEDIUM_DELAY_MS);
467 <        t2.join(MEDIUM_DELAY_MS);
468 <        assertTrue(!t1.isAlive());
340 <        assertTrue(!t2.isAlive());
466 >        awaitTermination(t1);
467 >        awaitTermination(t2);
468 >        assertNotWriteLocked(lock);
469      }
470  
471      /**
472 <     * Readlocks succeed after a writing thread unlocks
472 >     * Readlocks succeed only after a writing thread unlocks
473       */
474      public void testReadAfterWriteLock() throws InterruptedException {
475 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
476 <        lock.writeLock().lock();
477 <        Thread t1 = new Thread(new Runnable() {
478 <                public void run() {
479 <                    lock.readLock().lock();
480 <                    lock.readLock().unlock();
481 <                }
482 <            });
483 <        Thread t2 = new Thread(new Runnable() {
484 <                public void run() {
485 <                    lock.readLock().lock();
486 <                    lock.readLock().unlock();
359 <                }
360 <            });
475 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
476 >        lock.writeLock().lock();
477 >        Thread t1 = newStartedThread(new CheckedRunnable() {
478 >            public void realRun() {
479 >                lock.readLock().lock();
480 >                lock.readLock().unlock();
481 >            }});
482 >        Thread t2 = newStartedThread(new CheckedRunnable() {
483 >            public void realRun() {
484 >                lock.readLock().lock();
485 >                lock.readLock().unlock();
486 >            }});
487  
488 <        t1.start();
489 <        t2.start();
490 <        Thread.sleep(SHORT_DELAY_MS);
491 <        lock.writeLock().unlock();
492 <        t1.join(MEDIUM_DELAY_MS);
367 <        t2.join(MEDIUM_DELAY_MS);
368 <        assertTrue(!t1.isAlive());
369 <        assertTrue(!t2.isAlive());
488 >        waitForQueuedThread(lock, t1);
489 >        waitForQueuedThread(lock, t2);
490 >        releaseWriteLock(lock);
491 >        awaitTermination(t1);
492 >        awaitTermination(t2);
493      }
494  
495      /**
496       * Read trylock succeeds if write locked by current thread
497       */
498      public void testReadHoldingWriteLock() {
499 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
500 <        lock.writeLock().lock();
499 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
500 >        lock.writeLock().lock();
501          assertTrue(lock.readLock().tryLock());
502          lock.readLock().unlock();
503          lock.writeLock().unlock();
# Line 385 | Line 508 | public class ReentrantReadWriteLockTest
508       * other threads are waiting for readlock
509       */
510      public void testReadHoldingWriteLock2() throws InterruptedException {
511 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
512 <        lock.writeLock().lock();
390 <        Thread t1 = new Thread(new Runnable() {
391 <                public void run() {
392 <                    lock.readLock().lock();
393 <                    lock.readLock().unlock();
394 <                }
395 <            });
396 <        Thread t2 = new Thread(new Runnable() {
397 <                public void run() {
398 <                    lock.readLock().lock();
399 <                    lock.readLock().unlock();
400 <                }
401 <            });
402 <
403 <        t1.start();
404 <        t2.start();
511 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
512 >        lock.writeLock().lock();
513          lock.readLock().lock();
514          lock.readLock().unlock();
515 <        Thread.sleep(SHORT_DELAY_MS);
515 >
516 >        Thread t1 = newStartedThread(new CheckedRunnable() {
517 >            public void realRun() {
518 >                lock.readLock().lock();
519 >                lock.readLock().unlock();
520 >            }});
521 >        Thread t2 = newStartedThread(new CheckedRunnable() {
522 >            public void realRun() {
523 >                lock.readLock().lock();
524 >                lock.readLock().unlock();
525 >            }});
526 >
527 >        waitForQueuedThread(lock, t1);
528 >        waitForQueuedThread(lock, t2);
529 >        assertWriteLockedBy(lock, Thread.currentThread());
530          lock.readLock().lock();
531          lock.readLock().unlock();
532 <        lock.writeLock().unlock();
533 <        t1.join(MEDIUM_DELAY_MS);
534 <        t2.join(MEDIUM_DELAY_MS);
413 <        assertTrue(!t1.isAlive());
414 <        assertTrue(!t2.isAlive());
532 >        releaseWriteLock(lock);
533 >        awaitTermination(t1);
534 >        awaitTermination(t2);
535      }
536  
537      /**
538 <     *  Read lock succeeds if write locked by current thread even if
538 >     * Read lock succeeds if write locked by current thread even if
539       * other threads are waiting for writelock
540       */
541      public void testReadHoldingWriteLock3() throws InterruptedException {
542 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
543 <        lock.writeLock().lock();
424 <        Thread t1 = new Thread(new Runnable() {
425 <                public void run() {
426 <                    lock.writeLock().lock();
427 <                    lock.writeLock().unlock();
428 <                }
429 <            });
430 <        Thread t2 = new Thread(new Runnable() {
431 <                public void run() {
432 <                    lock.writeLock().lock();
433 <                    lock.writeLock().unlock();
434 <                }
435 <            });
436 <
437 <        t1.start();
438 <        t2.start();
542 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
543 >        lock.writeLock().lock();
544          lock.readLock().lock();
545          lock.readLock().unlock();
546 <        Thread.sleep(SHORT_DELAY_MS);
546 >
547 >        Thread t1 = newStartedThread(new CheckedRunnable() {
548 >            public void realRun() {
549 >                lock.writeLock().lock();
550 >                lock.writeLock().unlock();
551 >            }});
552 >        Thread t2 = newStartedThread(new CheckedRunnable() {
553 >            public void realRun() {
554 >                lock.writeLock().lock();
555 >                lock.writeLock().unlock();
556 >            }});
557 >
558 >        waitForQueuedThread(lock, t1);
559 >        waitForQueuedThread(lock, t2);
560 >        assertWriteLockedBy(lock, Thread.currentThread());
561          lock.readLock().lock();
562          lock.readLock().unlock();
563 <        lock.writeLock().unlock();
564 <        t1.join(MEDIUM_DELAY_MS);
565 <        t2.join(MEDIUM_DELAY_MS);
447 <        assertTrue(!t1.isAlive());
448 <        assertTrue(!t2.isAlive());
563 >        releaseWriteLock(lock);
564 >        awaitTermination(t1);
565 >        awaitTermination(t2);
566      }
567  
451
568      /**
569 <     *  Write lock succeeds if write locked by current thread even if
569 >     * Write lock succeeds if write locked by current thread even if
570       * other threads are waiting for writelock
571       */
572      public void testWriteHoldingWriteLock4() throws InterruptedException {
573 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
458 <        lock.writeLock().lock();
459 <        Thread t1 = new Thread(new Runnable() {
460 <                public void run() {
461 <                    lock.writeLock().lock();
462 <                    lock.writeLock().unlock();
463 <                }
464 <            });
465 <        Thread t2 = new Thread(new Runnable() {
466 <                public void run() {
467 <                    lock.writeLock().lock();
468 <                    lock.writeLock().unlock();
469 <                }
470 <            });
471 <
472 <        t1.start();
473 <        t2.start();
573 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
574          lock.writeLock().lock();
475        lock.writeLock().unlock();
476        Thread.sleep(SHORT_DELAY_MS);
575          lock.writeLock().lock();
576          lock.writeLock().unlock();
479        lock.writeLock().unlock();
480        t1.join(MEDIUM_DELAY_MS);
481        t2.join(MEDIUM_DELAY_MS);
482        assertTrue(!t1.isAlive());
483        assertTrue(!t2.isAlive());
484    }
577  
578 +        Thread t1 = newStartedThread(new CheckedRunnable() {
579 +            public void realRun() {
580 +                lock.writeLock().lock();
581 +                lock.writeLock().unlock();
582 +            }});
583 +        Thread t2 = newStartedThread(new CheckedRunnable() {
584 +            public void realRun() {
585 +                lock.writeLock().lock();
586 +                lock.writeLock().unlock();
587 +            }});
588 +
589 +        waitForQueuedThread(lock, t1);
590 +        waitForQueuedThread(lock, t2);
591 +        assertWriteLockedBy(lock, Thread.currentThread());
592 +        assertEquals(1, lock.getWriteHoldCount());
593 +        lock.writeLock().lock();
594 +        assertWriteLockedBy(lock, Thread.currentThread());
595 +        assertEquals(2, lock.getWriteHoldCount());
596 +        lock.writeLock().unlock();
597 +        releaseWriteLock(lock);
598 +        awaitTermination(t1);
599 +        awaitTermination(t2);
600 +    }
601  
602      /**
603       * Fair Read trylock succeeds if write locked by current thread
604       */
605      public void testReadHoldingWriteLockFair() {
606 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
607 <        lock.writeLock().lock();
606 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
607 >        lock.writeLock().lock();
608          assertTrue(lock.readLock().tryLock());
609          lock.readLock().unlock();
610          lock.writeLock().unlock();
# Line 500 | Line 615 | public class ReentrantReadWriteLockTest
615       * other threads are waiting for readlock
616       */
617      public void testReadHoldingWriteLockFair2() throws InterruptedException {
618 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
619 <        lock.writeLock().lock();
505 <        Thread t1 = new Thread(new Runnable() {
506 <                public void run() {
507 <                    lock.readLock().lock();
508 <                    lock.readLock().unlock();
509 <                }
510 <            });
511 <        Thread t2 = new Thread(new Runnable() {
512 <                public void run() {
513 <                    lock.readLock().lock();
514 <                    lock.readLock().unlock();
515 <                }
516 <            });
517 <
518 <        t1.start();
519 <        t2.start();
618 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
619 >        lock.writeLock().lock();
620          lock.readLock().lock();
621          lock.readLock().unlock();
622 <        Thread.sleep(SHORT_DELAY_MS);
622 >
623 >        Thread t1 = newStartedThread(new CheckedRunnable() {
624 >            public void realRun() {
625 >                lock.readLock().lock();
626 >                lock.readLock().unlock();
627 >            }});
628 >        Thread t2 = newStartedThread(new CheckedRunnable() {
629 >            public void realRun() {
630 >                lock.readLock().lock();
631 >                lock.readLock().unlock();
632 >            }});
633 >
634 >        waitForQueuedThread(lock, t1);
635 >        waitForQueuedThread(lock, t2);
636 >        assertWriteLockedBy(lock, Thread.currentThread());
637          lock.readLock().lock();
638          lock.readLock().unlock();
639 <        lock.writeLock().unlock();
640 <        t1.join(MEDIUM_DELAY_MS);
641 <        t2.join(MEDIUM_DELAY_MS);
528 <        assertTrue(!t1.isAlive());
529 <        assertTrue(!t2.isAlive());
639 >        releaseWriteLock(lock);
640 >        awaitTermination(t1);
641 >        awaitTermination(t2);
642      }
643  
532
644      /**
645       * Fair Read lock succeeds if write locked by current thread even if
646       * other threads are waiting for writelock
647       */
648      public void testReadHoldingWriteLockFair3() throws InterruptedException {
649 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
650 <        lock.writeLock().lock();
540 <        Thread t1 = new Thread(new Runnable() {
541 <                public void run() {
542 <                    lock.writeLock().lock();
543 <                    lock.writeLock().unlock();
544 <                }
545 <            });
546 <        Thread t2 = new Thread(new Runnable() {
547 <                public void run() {
548 <                    lock.writeLock().lock();
549 <                    lock.writeLock().unlock();
550 <                }
551 <            });
552 <
553 <        t1.start();
554 <        t2.start();
649 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
650 >        lock.writeLock().lock();
651          lock.readLock().lock();
652          lock.readLock().unlock();
653 <        Thread.sleep(SHORT_DELAY_MS);
653 >
654 >        Thread t1 = newStartedThread(new CheckedRunnable() {
655 >            public void realRun() {
656 >                lock.writeLock().lock();
657 >                lock.writeLock().unlock();
658 >            }});
659 >        Thread t2 = newStartedThread(new CheckedRunnable() {
660 >            public void realRun() {
661 >                lock.writeLock().lock();
662 >                lock.writeLock().unlock();
663 >            }});
664 >
665 >        waitForQueuedThread(lock, t1);
666 >        waitForQueuedThread(lock, t2);
667 >        assertWriteLockedBy(lock, Thread.currentThread());
668          lock.readLock().lock();
669          lock.readLock().unlock();
670 <        lock.writeLock().unlock();
671 <        t1.join(MEDIUM_DELAY_MS);
672 <        t2.join(MEDIUM_DELAY_MS);
563 <        assertTrue(!t1.isAlive());
564 <        assertTrue(!t2.isAlive());
670 >        releaseWriteLock(lock);
671 >        awaitTermination(t1);
672 >        awaitTermination(t2);
673      }
674  
567
675      /**
676       * Fair Write lock succeeds if write locked by current thread even if
677       * other threads are waiting for writelock
678       */
679      public void testWriteHoldingWriteLockFair4() throws InterruptedException {
680 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
681 <        lock.writeLock().lock();
682 <        Thread t1 = new Thread(new Runnable() {
683 <                public void run() {
684 <                    lock.writeLock().lock();
685 <                    lock.writeLock().unlock();
686 <                }
687 <            });
688 <        Thread t2 = new Thread(new Runnable() {
689 <                public void run() {
690 <                    lock.writeLock().lock();
691 <                    lock.writeLock().unlock();
585 <                }
586 <            });
680 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
681 >        lock.writeLock().lock();
682 >        Thread t1 = newStartedThread(new CheckedRunnable() {
683 >            public void realRun() {
684 >                lock.writeLock().lock();
685 >                lock.writeLock().unlock();
686 >            }});
687 >        Thread t2 = newStartedThread(new CheckedRunnable() {
688 >            public void realRun() {
689 >                lock.writeLock().lock();
690 >                lock.writeLock().unlock();
691 >            }});
692  
693 <        t1.start();
694 <        t2.start();
695 <        Thread.sleep(SHORT_DELAY_MS);
696 <        assertTrue(lock.isWriteLockedByCurrentThread());
592 <        assertTrue(lock.getWriteHoldCount() == 1);
693 >        waitForQueuedThread(lock, t1);
694 >        waitForQueuedThread(lock, t2);
695 >        assertWriteLockedBy(lock, Thread.currentThread());
696 >        assertEquals(1, lock.getWriteHoldCount());
697          lock.writeLock().lock();
698 <        assertTrue(lock.getWriteHoldCount() == 2);
698 >        assertEquals(2, lock.getWriteHoldCount());
699          lock.writeLock().unlock();
700          lock.writeLock().lock();
701          lock.writeLock().unlock();
702 <        lock.writeLock().unlock();
703 <        t1.join(MEDIUM_DELAY_MS);
704 <        t2.join(MEDIUM_DELAY_MS);
601 <        assertTrue(!t1.isAlive());
602 <        assertTrue(!t2.isAlive());
702 >        releaseWriteLock(lock);
703 >        awaitTermination(t1);
704 >        awaitTermination(t2);
705      }
706  
605
707      /**
708       * Read tryLock succeeds if readlocked but not writelocked
709       */
710      public void testTryLockWhenReadLocked() throws InterruptedException {
711 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
712 <        lock.readLock().lock();
713 <        Thread t = new Thread(new Runnable() {
714 <                public void run() {
715 <                    threadAssertTrue(lock.readLock().tryLock());
716 <                    lock.readLock().unlock();
717 <                }
617 <            });
711 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
712 >        lock.readLock().lock();
713 >        Thread t = newStartedThread(new CheckedRunnable() {
714 >            public void realRun() {
715 >                assertTrue(lock.readLock().tryLock());
716 >                lock.readLock().unlock();
717 >            }});
718  
719 <        t.start();
620 <        t.join();
719 >        awaitTermination(t);
720          lock.readLock().unlock();
721      }
722  
624
625
723      /**
724       * write tryLock fails when readlocked
725       */
726      public void testWriteTryLockWhenReadLocked() throws InterruptedException {
727 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
728 <        lock.readLock().lock();
729 <        Thread t = new Thread(new Runnable() {
730 <                public void run() {
731 <                    threadAssertFalse(lock.writeLock().tryLock());
732 <                }
636 <            });
727 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
728 >        lock.readLock().lock();
729 >        Thread t = newStartedThread(new CheckedRunnable() {
730 >            public void realRun() {
731 >                assertFalse(lock.writeLock().tryLock());
732 >            }});
733  
734 <        t.start();
639 <        t.join();
734 >        awaitTermination(t);
735          lock.readLock().unlock();
736      }
737  
643
738      /**
739       * Fair Read tryLock succeeds if readlocked but not writelocked
740       */
741      public void testTryLockWhenReadLockedFair() throws InterruptedException {
742 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
743 <        lock.readLock().lock();
744 <        Thread t = new Thread(new Runnable() {
745 <                public void run() {
746 <                    threadAssertTrue(lock.readLock().tryLock());
747 <                    lock.readLock().unlock();
748 <                }
655 <            });
742 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
743 >        lock.readLock().lock();
744 >        Thread t = newStartedThread(new CheckedRunnable() {
745 >            public void realRun() {
746 >                assertTrue(lock.readLock().tryLock());
747 >                lock.readLock().unlock();
748 >            }});
749  
750 <        t.start();
658 <        t.join();
750 >        awaitTermination(t);
751          lock.readLock().unlock();
752      }
753  
662
663
754      /**
755       * Fair write tryLock fails when readlocked
756       */
757      public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
758 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
759 <        lock.readLock().lock();
760 <        Thread t = new Thread(new Runnable() {
761 <                public void run() {
762 <                    threadAssertFalse(lock.writeLock().tryLock());
763 <                }
674 <            });
758 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
759 >        lock.readLock().lock();
760 >        Thread t = newStartedThread(new CheckedRunnable() {
761 >            public void realRun() {
762 >                assertFalse(lock.writeLock().tryLock());
763 >            }});
764  
765 <        t.start();
677 <        t.join();
765 >        awaitTermination(t);
766          lock.readLock().unlock();
767      }
768  
681
682
769      /**
770       * write timed tryLock times out if locked
771       */
772      public void testWriteTryLock_Timeout() throws InterruptedException {
773 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
774 <        lock.writeLock().lock();
775 <        Thread t = new Thread(new CheckedRunnable() {
773 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
774 >        lock.writeLock().lock();
775 >        Thread t = newStartedThread(new CheckedRunnable() {
776              public void realRun() throws InterruptedException {
777 <                threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
777 >                long startTime = System.nanoTime();
778 >                long timeoutMillis = 10;
779 >                assertFalse(lock.writeLock().tryLock(timeoutMillis, MILLISECONDS));
780 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
781              }});
782  
783 <        t.start();
695 <        t.join();
783 >        awaitTermination(t);
784          assertTrue(lock.writeLock().isHeldByCurrentThread());
785          lock.writeLock().unlock();
786      }
# Line 701 | Line 789 | public class ReentrantReadWriteLockTest
789       * read timed tryLock times out if write-locked
790       */
791      public void testReadTryLock_Timeout() throws InterruptedException {
792 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
793 <        lock.writeLock().lock();
794 <        Thread t = new Thread(new CheckedRunnable() {
792 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
793 >        lock.writeLock().lock();
794 >        Thread t = newStartedThread(new CheckedRunnable() {
795              public void realRun() throws InterruptedException {
796 <                threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
796 >                long startTime = System.nanoTime();
797 >                long timeoutMillis = 10;
798 >                assertFalse(lock.readLock().tryLock(timeoutMillis, MILLISECONDS));
799 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
800              }});
801  
802 <        t.start();
712 <        t.join();
802 >        awaitTermination(t);
803          assertTrue(lock.writeLock().isHeldByCurrentThread());
804          lock.writeLock().unlock();
805      }
806  
717
807      /**
808       * write lockInterruptibly succeeds if lock free else is interruptible
809       */
810      public void testWriteLockInterruptibly() throws InterruptedException {
811 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
811 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
812          lock.writeLock().lockInterruptibly();
813 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
813 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
814              public void realRun() throws InterruptedException {
815                  lock.writeLock().lockInterruptibly();
816              }});
817  
818 <        t.start();
730 <        Thread.sleep(SHORT_DELAY_MS);
818 >        waitForQueuedThread(lock, t);
819          t.interrupt();
820 <        Thread.sleep(SHORT_DELAY_MS);
821 <        t.join();
734 <        lock.writeLock().unlock();
820 >        awaitTermination(t);
821 >        releaseWriteLock(lock);
822      }
823  
824      /**
825 <     *  read lockInterruptibly succeeds if lock free else is interruptible
825 >     * read lockInterruptibly succeeds if lock free else is interruptible
826       */
827      public void testReadLockInterruptibly() throws InterruptedException {
828 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
828 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
829          lock.writeLock().lockInterruptibly();
830 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
830 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
831              public void realRun() throws InterruptedException {
832                  lock.readLock().lockInterruptibly();
833              }});
834  
835 <        t.start();
749 <        Thread.sleep(SHORT_DELAY_MS);
835 >        waitForQueuedThread(lock, t);
836          t.interrupt();
837 <        t.join();
838 <        lock.writeLock().unlock();
837 >        awaitTermination(t);
838 >        releaseWriteLock(lock);
839      }
840  
841      /**
842       * Calling await without holding lock throws IllegalMonitorStateException
843       */
844      public void testAwait_IllegalMonitor() throws InterruptedException {
845 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
845 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
846          final Condition c = lock.writeLock().newCondition();
847          try {
848              c.await();
849              shouldThrow();
850          } catch (IllegalMonitorStateException success) {}
851 +        try {
852 +            c.await(LONG_DELAY_MS, MILLISECONDS);
853 +            shouldThrow();
854 +        } catch (IllegalMonitorStateException success) {}
855 +        try {
856 +            c.awaitNanos(100);
857 +            shouldThrow();
858 +        } catch (IllegalMonitorStateException success) {}
859 +        try {
860 +            c.awaitUninterruptibly();
861 +            shouldThrow();
862 +        } catch (IllegalMonitorStateException success) {}
863      }
864  
865      /**
866       * Calling signal without holding lock throws IllegalMonitorStateException
867       */
868      public void testSignal_IllegalMonitor() {
869 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
869 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
870          final Condition c = lock.writeLock().newCondition();
871          try {
872              c.signal();
# Line 777 | Line 875 | public class ReentrantReadWriteLockTest
875      }
876  
877      /**
878 +     * Calling signalAll without holding lock throws IllegalMonitorStateException
879 +     */
880 +    public void testSignalAll_IllegalMonitor() {
881 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
882 +        final Condition c = lock.writeLock().newCondition();
883 +        try {
884 +            c.signalAll();
885 +            shouldThrow();
886 +        } catch (IllegalMonitorStateException success) {}
887 +    }
888 +
889 +    /**
890       * awaitNanos without a signal times out
891       */
892      public void testAwaitNanos_Timeout() throws InterruptedException {
893 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
893 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
894          final Condition c = lock.writeLock().newCondition();
785
895          lock.writeLock().lock();
896 <        long t = c.awaitNanos(100);
897 <        assertTrue(t <= 0);
896 >        long startTime = System.nanoTime();
897 >        long timeoutMillis = 10;
898 >        long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
899 >        long nanosRemaining = c.awaitNanos(timeoutNanos);
900 >        assertTrue(nanosRemaining <= 0);
901 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
902          lock.writeLock().unlock();
903      }
904  
792
905      /**
906 <     *  timed await without a signal times out
906 >     * timed await without a signal times out
907       */
908      public void testAwait_Timeout() throws InterruptedException {
909 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
909 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
910          final Condition c = lock.writeLock().newCondition();
911          lock.writeLock().lock();
912 <        assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
912 >        long startTime = System.nanoTime();
913 >        long timeoutMillis = 10;
914 >        assertFalse(c.await(timeoutMillis, MILLISECONDS));
915 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
916          lock.writeLock().unlock();
917      }
918  
# Line 805 | Line 920 | public class ReentrantReadWriteLockTest
920       * awaitUntil without a signal times out
921       */
922      public void testAwaitUntil_Timeout() throws InterruptedException {
923 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
923 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
924          final Condition c = lock.writeLock().newCondition();
925          lock.writeLock().lock();
926 +        long startTime = System.nanoTime();
927 +        long timeoutMillis = 10;
928          java.util.Date d = new java.util.Date();
929 <        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
929 >        assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
930 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
931          lock.writeLock().unlock();
932      }
933  
# Line 817 | Line 935 | public class ReentrantReadWriteLockTest
935       * await returns when signalled
936       */
937      public void testAwait() throws InterruptedException {
938 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
938 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
939          final Condition c = lock.writeLock().newCondition();
940 <        Thread t = new Thread(new CheckedRunnable() {
940 >        final CountDownLatch locked = new CountDownLatch(1);
941 >        Thread t = newStartedThread(new CheckedRunnable() {
942              public void realRun() throws InterruptedException {
943                  lock.writeLock().lock();
944 +                locked.countDown();
945                  c.await();
946                  lock.writeLock().unlock();
947              }});
948  
949 <        t.start();
830 <        Thread.sleep(SHORT_DELAY_MS);
949 >        locked.await();
950          lock.writeLock().lock();
951 +        assertHasWaiters(lock, c, t);
952          c.signal();
953 +        assertHasNoWaiters(lock, c);
954 +        assertTrue(t.isAlive());
955          lock.writeLock().unlock();
956 <        t.join(SHORT_DELAY_MS);
835 <        assertFalse(t.isAlive());
836 <    }
837 <
838 <    /** A helper class for uninterruptible wait tests */
839 <    class UninterruptableThread extends Thread {
840 <        private Lock lock;
841 <        private Condition c;
842 <
843 <        public volatile boolean canAwake = false;
844 <        public volatile boolean interrupted = false;
845 <        public volatile boolean lockStarted = false;
846 <
847 <        public UninterruptableThread(Lock lock, Condition c) {
848 <            this.lock = lock;
849 <            this.c = c;
850 <        }
851 <
852 <        public synchronized void run() {
853 <            lock.lock();
854 <            lockStarted = true;
855 <
856 <            while (!canAwake) {
857 <                c.awaitUninterruptibly();
858 <            }
859 <
860 <            interrupted = isInterrupted();
861 <            lock.unlock();
862 <        }
956 >        awaitTermination(t);
957      }
958  
959      /**
# Line 868 | Line 962 | public class ReentrantReadWriteLockTest
962      public void testAwaitUninterruptibly() throws InterruptedException {
963          final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
964          final Condition c = lock.writeLock().newCondition();
965 <        UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
966 <
967 <        thread.start();
968 <
969 <        while (!thread.lockStarted) {
970 <            Thread.sleep(100);
971 <        }
965 >        final CountDownLatch locked = new CountDownLatch(1);
966 >        Thread t = newStartedThread(new CheckedRunnable() {
967 >            public void realRun() {
968 >                lock.writeLock().lock();
969 >                locked.countDown();
970 >                c.awaitUninterruptibly();
971 >                assertTrue(Thread.interrupted());
972 >                lock.writeLock().unlock();
973 >            }});
974  
975 +        locked.await();
976          lock.writeLock().lock();
977 <        try {
978 <            thread.interrupt();
979 <            thread.canAwake = true;
980 <            c.signal();
981 <        } finally {
982 <            lock.writeLock().unlock();
983 <        }
984 <
888 <        thread.join();
889 <        assertTrue(thread.interrupted);
890 <        assertFalse(thread.isAlive());
977 >        lock.writeLock().unlock();
978 >        t.interrupt();
979 >        long timeoutMillis = 10;
980 >        assertThreadJoinTimesOut(t, timeoutMillis);
981 >        lock.writeLock().lock();
982 >        c.signal();
983 >        lock.writeLock().unlock();
984 >        awaitTermination(t);
985      }
986  
987      /**
988       * await is interruptible
989       */
990      public void testAwait_Interrupt() throws InterruptedException {
991 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
991 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
992          final Condition c = lock.writeLock().newCondition();
993 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
993 >        final CountDownLatch locked = new CountDownLatch(1);
994 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
995              public void realRun() throws InterruptedException {
996                  lock.writeLock().lock();
997 <                c.await();
998 <                lock.writeLock().unlock();
997 >                assertWriteLockedBy(lock, Thread.currentThread());
998 >                assertHasNoWaiters(lock, c);
999 >                locked.countDown();
1000 >                try {
1001 >                    c.await();
1002 >                } finally {
1003 >                    assertWriteLockedBy(lock, Thread.currentThread());
1004 >                    assertHasNoWaiters(lock, c);
1005 >                    lock.writeLock().unlock();
1006 >                    assertFalse(Thread.interrupted());
1007 >                }
1008              }});
1009  
1010 <        t.start();
1011 <        Thread.sleep(SHORT_DELAY_MS);
1010 >        locked.await();
1011 >        assertHasWaiters(lock, c, t);
1012          t.interrupt();
1013 <        t.join(SHORT_DELAY_MS);
1014 <        assertFalse(t.isAlive());
1013 >        awaitTermination(t);
1014 >        assertNotWriteLocked(lock);
1015      }
1016  
1017      /**
1018       * awaitNanos is interruptible
1019       */
1020      public void testAwaitNanos_Interrupt() throws InterruptedException {
1021 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1021 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1022          final Condition c = lock.writeLock().newCondition();
1023 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
1023 >        final CountDownLatch locked = new CountDownLatch(1);
1024 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1025              public void realRun() throws InterruptedException {
1026                  lock.writeLock().lock();
1027 <                c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
1028 <                lock.writeLock().unlock();
1027 >                assertWriteLockedBy(lock, Thread.currentThread());
1028 >                assertHasNoWaiters(lock, c);
1029 >                locked.countDown();
1030 >                try {
1031 >                    c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
1032 >                } finally {
1033 >                    assertWriteLockedBy(lock, Thread.currentThread());
1034 >                    assertHasNoWaiters(lock, c);
1035 >                    lock.writeLock().unlock();
1036 >                    assertFalse(Thread.interrupted());
1037 >                }
1038              }});
1039  
1040 <        t.start();
1041 <        Thread.sleep(SHORT_DELAY_MS);
1040 >        locked.await();
1041 >        assertHasWaiters(lock, c, t);
1042          t.interrupt();
1043 <        t.join(SHORT_DELAY_MS);
1044 <        assertFalse(t.isAlive());
1043 >        awaitTermination(t);
1044 >        assertNotWriteLocked(lock);
1045      }
1046  
1047      /**
1048       * awaitUntil is interruptible
1049       */
1050      public void testAwaitUntil_Interrupt() throws InterruptedException {
1051 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1051 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1052          final Condition c = lock.writeLock().newCondition();
1053 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
1053 >        final CountDownLatch locked = new CountDownLatch(1);
1054 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1055              public void realRun() throws InterruptedException {
1056                  lock.writeLock().lock();
1057 +                assertWriteLockedBy(lock, Thread.currentThread());
1058 +                assertHasNoWaiters(lock, c);
1059 +                locked.countDown();
1060                  java.util.Date d = new java.util.Date();
1061 <                c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1062 <                lock.writeLock().unlock();
1061 >                try {
1062 >                    c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS));
1063 >                } finally {
1064 >                    assertWriteLockedBy(lock, Thread.currentThread());
1065 >                    assertHasNoWaiters(lock, c);
1066 >                    lock.writeLock().unlock();
1067 >                    assertFalse(Thread.interrupted());
1068 >                }
1069              }});
1070  
1071 <        t.start();
1072 <        Thread.sleep(SHORT_DELAY_MS);
1071 >        locked.await();
1072 >        assertHasWaiters(lock, c, t);
1073          t.interrupt();
1074 <        t.join(SHORT_DELAY_MS);
1075 <        assertFalse(t.isAlive());
1074 >        awaitTermination(t);
1075 >        assertNotWriteLocked(lock);
1076      }
1077  
1078      /**
1079       * signalAll wakes up all threads
1080       */
1081      public void testSignalAll() throws InterruptedException {
1082 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1082 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1083 >        final Condition c = lock.writeLock().newCondition();
1084 >        final CountDownLatch locked = new CountDownLatch(2);
1085 >        final Lock writeLock = lock.writeLock();
1086 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1087 >            public void realRun() throws InterruptedException {
1088 >                writeLock.lock();
1089 >                locked.countDown();
1090 >                c.await();
1091 >                writeLock.unlock();
1092 >            }});
1093 >
1094 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1095 >            public void realRun() throws InterruptedException {
1096 >                writeLock.lock();
1097 >                locked.countDown();
1098 >                c.await();
1099 >                writeLock.unlock();
1100 >            }});
1101 >
1102 >        locked.await();
1103 >        writeLock.lock();
1104 >        assertHasWaiters(lock, c, t1, t2);
1105 >        c.signalAll();
1106 >        assertHasNoWaiters(lock, c);
1107 >        writeLock.unlock();
1108 >        awaitTermination(t1);
1109 >        awaitTermination(t2);
1110 >    }
1111 >
1112 >    /**
1113 >     * signal wakes up waiting threads in FIFO order.
1114 >     */
1115 >    public void testSignalWakesFifo() throws InterruptedException {
1116 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1117          final Condition c = lock.writeLock().newCondition();
1118 <        Thread t1 = new Thread(new CheckedRunnable() {
1118 >        final CountDownLatch locked1 = new CountDownLatch(1);
1119 >        final CountDownLatch locked2 = new CountDownLatch(1);
1120 >        final Lock writeLock = lock.writeLock();
1121 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1122 >            public void realRun() throws InterruptedException {
1123 >                writeLock.lock();
1124 >                locked1.countDown();
1125 >                c.await();
1126 >                writeLock.unlock();
1127 >            }});
1128 >
1129 >        locked1.await();
1130 >
1131 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1132 >            public void realRun() throws InterruptedException {
1133 >                writeLock.lock();
1134 >                locked2.countDown();
1135 >                c.await();
1136 >                writeLock.unlock();
1137 >            }});
1138 >
1139 >        locked2.await();
1140 >
1141 >        writeLock.lock();
1142 >        assertHasWaiters(lock, c, t1, t2);
1143 >        assertFalse(lock.hasQueuedThreads());
1144 >        c.signal();
1145 >        assertHasWaiters(lock, c, t2);
1146 >        assertTrue(lock.hasQueuedThread(t1));
1147 >        assertFalse(lock.hasQueuedThread(t2));
1148 >        c.signal();
1149 >        assertHasNoWaiters(lock, c);
1150 >        assertTrue(lock.hasQueuedThread(t1));
1151 >        assertTrue(lock.hasQueuedThread(t2));
1152 >        writeLock.unlock();
1153 >        awaitTermination(t1);
1154 >        awaitTermination(t2);
1155 >    }
1156 >
1157 >    /**
1158 >     * await after multiple reentrant locking preserves lock count
1159 >     */
1160 >    public void testAwaitLockCount() throws InterruptedException {
1161 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1162 >        final Condition c = lock.writeLock().newCondition();
1163 >        final CountDownLatch locked = new CountDownLatch(2);
1164 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1165              public void realRun() throws InterruptedException {
1166                  lock.writeLock().lock();
1167 +                assertWriteLockedBy(lock, Thread.currentThread());
1168 +                assertEquals(1, lock.writeLock().getHoldCount());
1169 +                locked.countDown();
1170                  c.await();
1171 +                assertWriteLockedBy(lock, Thread.currentThread());
1172 +                assertEquals(1, lock.writeLock().getHoldCount());
1173                  lock.writeLock().unlock();
1174              }});
1175  
1176 <        Thread t2 = new Thread(new CheckedRunnable() {
1176 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1177              public void realRun() throws InterruptedException {
1178                  lock.writeLock().lock();
1179 +                lock.writeLock().lock();
1180 +                assertWriteLockedBy(lock, Thread.currentThread());
1181 +                assertEquals(2, lock.writeLock().getHoldCount());
1182 +                locked.countDown();
1183                  c.await();
1184 +                assertWriteLockedBy(lock, Thread.currentThread());
1185 +                assertEquals(2, lock.writeLock().getHoldCount());
1186 +                lock.writeLock().unlock();
1187                  lock.writeLock().unlock();
1188              }});
1189  
1190 <        t1.start();
975 <        t2.start();
976 <        Thread.sleep(SHORT_DELAY_MS);
1190 >        locked.await();
1191          lock.writeLock().lock();
1192 +        assertHasWaiters(lock, c, t1, t2);
1193          c.signalAll();
1194 +        assertHasNoWaiters(lock, c);
1195          lock.writeLock().unlock();
1196 <        t1.join(SHORT_DELAY_MS);
1197 <        t2.join(SHORT_DELAY_MS);
982 <        assertFalse(t1.isAlive());
983 <        assertFalse(t2.isAlive());
1196 >        awaitTermination(t1);
1197 >        awaitTermination(t2);
1198      }
1199  
1200      /**
# Line 1006 | Line 1220 | public class ReentrantReadWriteLockTest
1220      /**
1221       * hasQueuedThreads reports whether there are waiting threads
1222       */
1223 <    public void testhasQueuedThreads() throws InterruptedException {
1224 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1223 >    public void testHasQueuedThreads() throws InterruptedException {
1224 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1225          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1226          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1227          assertFalse(lock.hasQueuedThreads());
1228          lock.writeLock().lock();
1229 +        assertFalse(lock.hasQueuedThreads());
1230          t1.start();
1231 <        Thread.sleep(SHORT_DELAY_MS);
1231 >        waitForQueuedThread(lock, t1);
1232          assertTrue(lock.hasQueuedThreads());
1233          t2.start();
1234 <        Thread.sleep(SHORT_DELAY_MS);
1234 >        waitForQueuedThread(lock, t2);
1235          assertTrue(lock.hasQueuedThreads());
1236          t1.interrupt();
1237 <        Thread.sleep(SHORT_DELAY_MS);
1237 >        awaitTermination(t1);
1238          assertTrue(lock.hasQueuedThreads());
1239          lock.writeLock().unlock();
1240 <        Thread.sleep(SHORT_DELAY_MS);
1240 >        awaitTermination(t2);
1241          assertFalse(lock.hasQueuedThreads());
1027        t1.join();
1028        t2.join();
1242      }
1243  
1244      /**
1245       * hasQueuedThread(null) throws NPE
1246       */
1247      public void testHasQueuedThreadNPE() {
1248 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1248 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1249          try {
1250 <            sync.hasQueuedThread(null);
1250 >            lock.hasQueuedThread(null);
1251              shouldThrow();
1252          } catch (NullPointerException success) {}
1253      }
# Line 1043 | Line 1256 | public class ReentrantReadWriteLockTest
1256       * hasQueuedThread reports whether a thread is queued.
1257       */
1258      public void testHasQueuedThread() throws InterruptedException {
1259 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1260 <        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1261 <        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1262 <        assertFalse(sync.hasQueuedThread(t1));
1263 <        assertFalse(sync.hasQueuedThread(t2));
1264 <        sync.writeLock().lock();
1259 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1260 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1261 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1262 >        assertFalse(lock.hasQueuedThread(t1));
1263 >        assertFalse(lock.hasQueuedThread(t2));
1264 >        lock.writeLock().lock();
1265          t1.start();
1266 <        Thread.sleep(SHORT_DELAY_MS);
1267 <        assertTrue(sync.hasQueuedThread(t1));
1266 >        waitForQueuedThread(lock, t1);
1267 >        assertTrue(lock.hasQueuedThread(t1));
1268 >        assertFalse(lock.hasQueuedThread(t2));
1269          t2.start();
1270 <        Thread.sleep(SHORT_DELAY_MS);
1271 <        assertTrue(sync.hasQueuedThread(t1));
1272 <        assertTrue(sync.hasQueuedThread(t2));
1270 >        waitForQueuedThread(lock, t2);
1271 >        assertTrue(lock.hasQueuedThread(t1));
1272 >        assertTrue(lock.hasQueuedThread(t2));
1273          t1.interrupt();
1274 <        Thread.sleep(SHORT_DELAY_MS);
1275 <        assertFalse(sync.hasQueuedThread(t1));
1276 <        assertTrue(sync.hasQueuedThread(t2));
1277 <        sync.writeLock().unlock();
1278 <        Thread.sleep(SHORT_DELAY_MS);
1279 <        assertFalse(sync.hasQueuedThread(t1));
1280 <        Thread.sleep(SHORT_DELAY_MS);
1067 <        assertFalse(sync.hasQueuedThread(t2));
1068 <        t1.join();
1069 <        t2.join();
1274 >        awaitTermination(t1);
1275 >        assertFalse(lock.hasQueuedThread(t1));
1276 >        assertTrue(lock.hasQueuedThread(t2));
1277 >        lock.writeLock().unlock();
1278 >        awaitTermination(t2);
1279 >        assertFalse(lock.hasQueuedThread(t1));
1280 >        assertFalse(lock.hasQueuedThread(t2));
1281      }
1282  
1072
1283      /**
1284       * getQueueLength reports number of waiting threads
1285       */
1286      public void testGetQueueLength() throws InterruptedException {
1287 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1287 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1288          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1289          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1290          assertEquals(0, lock.getQueueLength());
1291          lock.writeLock().lock();
1292          t1.start();
1293 <        Thread.sleep(SHORT_DELAY_MS);
1293 >        waitForQueuedThread(lock, t1);
1294          assertEquals(1, lock.getQueueLength());
1295          t2.start();
1296 <        Thread.sleep(SHORT_DELAY_MS);
1296 >        waitForQueuedThread(lock, t2);
1297          assertEquals(2, lock.getQueueLength());
1298          t1.interrupt();
1299 <        Thread.sleep(SHORT_DELAY_MS);
1299 >        awaitTermination(t1);
1300          assertEquals(1, lock.getQueueLength());
1301          lock.writeLock().unlock();
1302 <        Thread.sleep(SHORT_DELAY_MS);
1302 >        awaitTermination(t2);
1303          assertEquals(0, lock.getQueueLength());
1094        t1.join();
1095        t2.join();
1304      }
1305  
1306      /**
1307       * getQueuedThreads includes waiting threads
1308       */
1309      public void testGetQueuedThreads() throws InterruptedException {
1310 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1310 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1311          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1312          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1313          assertTrue(lock.getQueuedThreads().isEmpty());
1314          lock.writeLock().lock();
1315          assertTrue(lock.getQueuedThreads().isEmpty());
1316          t1.start();
1317 <        Thread.sleep(SHORT_DELAY_MS);
1317 >        waitForQueuedThread(lock, t1);
1318 >        assertEquals(1, lock.getQueuedThreads().size());
1319          assertTrue(lock.getQueuedThreads().contains(t1));
1320          t2.start();
1321 <        Thread.sleep(SHORT_DELAY_MS);
1321 >        waitForQueuedThread(lock, t2);
1322 >        assertEquals(2, lock.getQueuedThreads().size());
1323          assertTrue(lock.getQueuedThreads().contains(t1));
1324          assertTrue(lock.getQueuedThreads().contains(t2));
1325          t1.interrupt();
1326 <        Thread.sleep(SHORT_DELAY_MS);
1326 >        awaitTermination(t1);
1327          assertFalse(lock.getQueuedThreads().contains(t1));
1328          assertTrue(lock.getQueuedThreads().contains(t2));
1329 +        assertEquals(1, lock.getQueuedThreads().size());
1330          lock.writeLock().unlock();
1331 <        Thread.sleep(SHORT_DELAY_MS);
1331 >        awaitTermination(t2);
1332          assertTrue(lock.getQueuedThreads().isEmpty());
1122        t1.join();
1123        t2.join();
1333      }
1334  
1335      /**
1336       * hasWaiters throws NPE if null
1337       */
1338      public void testHasWaitersNPE() {
1339 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1339 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1340          try {
1341              lock.hasWaiters(null);
1342              shouldThrow();
# Line 1138 | Line 1347 | public class ReentrantReadWriteLockTest
1347       * getWaitQueueLength throws NPE if null
1348       */
1349      public void testGetWaitQueueLengthNPE() {
1350 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1350 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1351          try {
1352              lock.getWaitQueueLength(null);
1353              shouldThrow();
1354          } catch (NullPointerException success) {}
1355      }
1356  
1148
1357      /**
1358       * getWaitingThreads throws NPE if null
1359       */
1360      public void testGetWaitingThreadsNPE() {
1361 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1361 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1362          try {
1363              lock.getWaitingThreads(null);
1364              shouldThrow();
# Line 1158 | Line 1366 | public class ReentrantReadWriteLockTest
1366      }
1367  
1368      /**
1369 <     * hasWaiters throws IAE if not owned
1369 >     * hasWaiters throws IllegalArgumentException if not owned
1370       */
1371      public void testHasWaitersIAE() {
1372 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1372 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1373          final Condition c = lock.writeLock().newCondition();
1374 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1374 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1375          try {
1376              lock2.hasWaiters(c);
1377              shouldThrow();
# Line 1171 | Line 1379 | public class ReentrantReadWriteLockTest
1379      }
1380  
1381      /**
1382 <     * hasWaiters throws IMSE if not locked
1382 >     * hasWaiters throws IllegalMonitorStateException if not locked
1383       */
1384      public void testHasWaitersIMSE() {
1385 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1385 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1386          final Condition c = lock.writeLock().newCondition();
1387          try {
1388              lock.hasWaiters(c);
# Line 1182 | Line 1390 | public class ReentrantReadWriteLockTest
1390          } catch (IllegalMonitorStateException success) {}
1391      }
1392  
1185
1393      /**
1394 <     * getWaitQueueLength throws IAE if not owned
1394 >     * getWaitQueueLength throws IllegalArgumentException if not owned
1395       */
1396      public void testGetWaitQueueLengthIAE() {
1397 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1397 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1398          final Condition c = lock.writeLock().newCondition();
1399 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1399 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1400          try {
1401              lock2.getWaitQueueLength(c);
1402              shouldThrow();
# Line 1197 | Line 1404 | public class ReentrantReadWriteLockTest
1404      }
1405  
1406      /**
1407 <     * getWaitQueueLength throws IMSE if not locked
1407 >     * getWaitQueueLength throws IllegalMonitorStateException if not locked
1408       */
1409      public void testGetWaitQueueLengthIMSE() {
1410 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1410 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1411          final Condition c = lock.writeLock().newCondition();
1412          try {
1413              lock.getWaitQueueLength(c);
# Line 1208 | Line 1415 | public class ReentrantReadWriteLockTest
1415          } catch (IllegalMonitorStateException success) {}
1416      }
1417  
1211
1418      /**
1419 <     * getWaitingThreads throws IAE if not owned
1419 >     * getWaitingThreads throws IllegalArgumentException if not owned
1420       */
1421      public void testGetWaitingThreadsIAE() {
1422 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1422 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1423          final Condition c = lock.writeLock().newCondition();
1424 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1424 >        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1425          try {
1426              lock2.getWaitingThreads(c);
1427              shouldThrow();
# Line 1223 | Line 1429 | public class ReentrantReadWriteLockTest
1429      }
1430  
1431      /**
1432 <     * getWaitingThreads throws IMSE if not locked
1432 >     * getWaitingThreads throws IllegalMonitorStateException if not locked
1433       */
1434      public void testGetWaitingThreadsIMSE() {
1435 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1435 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1436          final Condition c = lock.writeLock().newCondition();
1437          try {
1438              lock.getWaitingThreads(c);
# Line 1234 | Line 1440 | public class ReentrantReadWriteLockTest
1440          } catch (IllegalMonitorStateException success) {}
1441      }
1442  
1237
1443      /**
1444       * hasWaiters returns true when a thread is waiting, else false
1445       */
1446      public void testHasWaiters() throws InterruptedException {
1447 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1447 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1448          final Condition c = lock.writeLock().newCondition();
1449 <        Thread t = new Thread(new CheckedRunnable() {
1449 >        final CountDownLatch locked = new CountDownLatch(1);
1450 >        Thread t = newStartedThread(new CheckedRunnable() {
1451              public void realRun() throws InterruptedException {
1452                  lock.writeLock().lock();
1453 <                threadAssertFalse(lock.hasWaiters(c));
1454 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
1453 >                assertHasNoWaiters(lock, c);
1454 >                assertFalse(lock.hasWaiters(c));
1455 >                locked.countDown();
1456                  c.await();
1457 +                assertHasNoWaiters(lock, c);
1458 +                assertFalse(lock.hasWaiters(c));
1459                  lock.writeLock().unlock();
1460              }});
1461  
1462 <        t.start();
1254 <        Thread.sleep(SHORT_DELAY_MS);
1462 >        locked.await();
1463          lock.writeLock().lock();
1464 +        assertHasWaiters(lock, c, t);
1465          assertTrue(lock.hasWaiters(c));
1257        assertEquals(1, lock.getWaitQueueLength(c));
1466          c.signal();
1467 <        lock.writeLock().unlock();
1260 <        Thread.sleep(SHORT_DELAY_MS);
1261 <        lock.writeLock().lock();
1467 >        assertHasNoWaiters(lock, c);
1468          assertFalse(lock.hasWaiters(c));
1263        assertEquals(0, lock.getWaitQueueLength(c));
1469          lock.writeLock().unlock();
1470 <        t.join(SHORT_DELAY_MS);
1471 <        assertFalse(t.isAlive());
1470 >        awaitTermination(t);
1471 >        assertHasNoWaiters(lock, c);
1472      }
1473  
1474      /**
1475       * getWaitQueueLength returns number of waiting threads
1476       */
1477      public void testGetWaitQueueLength() throws InterruptedException {
1478 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1478 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1479          final Condition c = lock.writeLock().newCondition();
1480 <        Thread t = new Thread(new CheckedRunnable() {
1480 >        final CountDownLatch locked = new CountDownLatch(1);
1481 >        Thread t = newStartedThread(new CheckedRunnable() {
1482              public void realRun() throws InterruptedException {
1483                  lock.writeLock().lock();
1484 <                threadAssertFalse(lock.hasWaiters(c));
1485 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
1484 >                assertEquals(0, lock.getWaitQueueLength(c));
1485 >                locked.countDown();
1486                  c.await();
1487                  lock.writeLock().unlock();
1488              }});
1489  
1490 <        t.start();
1285 <        Thread.sleep(SHORT_DELAY_MS);
1490 >        locked.await();
1491          lock.writeLock().lock();
1492 <        assertTrue(lock.hasWaiters(c));
1492 >        assertHasWaiters(lock, c, t);
1493          assertEquals(1, lock.getWaitQueueLength(c));
1494          c.signal();
1495 <        lock.writeLock().unlock();
1291 <        Thread.sleep(SHORT_DELAY_MS);
1292 <        lock.writeLock().lock();
1293 <        assertFalse(lock.hasWaiters(c));
1495 >        assertHasNoWaiters(lock, c);
1496          assertEquals(0, lock.getWaitQueueLength(c));
1497          lock.writeLock().unlock();
1498 <        t.join(SHORT_DELAY_MS);
1297 <        assertFalse(t.isAlive());
1498 >        awaitTermination(t);
1499      }
1500  
1300
1501      /**
1502       * getWaitingThreads returns only and all waiting threads
1503       */
1504      public void testGetWaitingThreads() throws InterruptedException {
1505 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1505 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1506          final Condition c = lock.writeLock().newCondition();
1507 <        Thread t1 = new Thread(new CheckedRunnable() {
1507 >        final CountDownLatch locked1 = new CountDownLatch(1);
1508 >        final CountDownLatch locked2 = new CountDownLatch(1);
1509 >        Thread t1 = new Thread(new CheckedRunnable() {
1510              public void realRun() throws InterruptedException {
1511                  lock.writeLock().lock();
1512 <                threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1512 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
1513 >                locked1.countDown();
1514                  c.await();
1515                  lock.writeLock().unlock();
1516              }});
1517  
1518 <        Thread t2 = new Thread(new CheckedRunnable() {
1518 >        Thread t2 = new Thread(new CheckedRunnable() {
1519              public void realRun() throws InterruptedException {
1520                  lock.writeLock().lock();
1521 <                threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1521 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
1522 >                locked2.countDown();
1523                  c.await();
1524                  lock.writeLock().unlock();
1525              }});
# Line 1323 | Line 1527 | public class ReentrantReadWriteLockTest
1527          lock.writeLock().lock();
1528          assertTrue(lock.getWaitingThreads(c).isEmpty());
1529          lock.writeLock().unlock();
1530 +
1531          t1.start();
1532 <        Thread.sleep(SHORT_DELAY_MS);
1532 >        locked1.await();
1533          t2.start();
1534 <        Thread.sleep(SHORT_DELAY_MS);
1534 >        locked2.await();
1535 >
1536          lock.writeLock().lock();
1537          assertTrue(lock.hasWaiters(c));
1538          assertTrue(lock.getWaitingThreads(c).contains(t1));
1539          assertTrue(lock.getWaitingThreads(c).contains(t2));
1540 +        assertEquals(2, lock.getWaitingThreads(c).size());
1541          c.signalAll();
1542 +        assertHasNoWaiters(lock, c);
1543          lock.writeLock().unlock();
1544 <        Thread.sleep(SHORT_DELAY_MS);
1545 <        lock.writeLock().lock();
1546 <        assertFalse(lock.hasWaiters(c));
1547 <        assertTrue(lock.getWaitingThreads(c).isEmpty());
1548 <        lock.writeLock().unlock();
1341 <        t1.join(SHORT_DELAY_MS);
1342 <        t2.join(SHORT_DELAY_MS);
1343 <        assertFalse(t1.isAlive());
1344 <        assertFalse(t2.isAlive());
1544 >
1545 >        awaitTermination(t1);
1546 >        awaitTermination(t2);
1547 >
1548 >        assertHasNoWaiters(lock, c);
1549      }
1550  
1551      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines