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.57 by dl, Sat May 7 11:15:04 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 58 | Line 59 | public class ReentrantReadWriteLockTest
59      }
60  
61      /**
62 +     * Releases write lock, checking that it had a hold count of 1.
63 +     */
64 +    void releaseWriteLock(ReentrantReadWriteLock lock) {
65 +        ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
66 +        assertTrue(writeLock.isHeldByCurrentThread());
67 +        writeLock.unlock();
68 +        assertFalse(writeLock.isHeldByCurrentThread());
69 +    }
70 +
71 +    /**
72 +     * Spin-waits until lock.hasQueuedThread(t) becomes true.
73 +     */
74 +    void waitForQueuedThread(ReentrantReadWriteLock lock, Thread t) {
75 +        long startTime = System.nanoTime();
76 +        while (!lock.hasQueuedThread(t)) {
77 +            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
78 +                throw new AssertionError("timed out");
79 +            Thread.yield();
80 +        }
81 +    }
82 +
83 +    /**
84 +     * Checks that lock is not write-locked.
85 +     */
86 +    void assertNotWriteLocked(ReentrantReadWriteLock lock) {
87 +        assertFalse(lock.isWriteLocked());
88 +        assertFalse(lock.isWriteLockedByCurrentThread());
89 +        assertEquals(0, lock.getWriteHoldCount());
90 +    }
91 +
92 +    /**
93 +     * Checks that condition c has no waiters.
94 +     */
95 +    void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
96 +        assertHasWaiters(lock, c, new Thread[] {});
97 +    }
98 +
99 +    /**
100 +     * Checks that condition c has exactly the given waiter threads.
101 +     */
102 +    void assertHasWaiters(PublicReentrantReadWriteLock lock, Condition c,
103 +                          Thread... threads) {
104 +        lock.writeLock().lock();
105 +        assertEquals(threads.length > 0, lock.hasWaiters(c));
106 +        assertEquals(threads.length, lock.getWaitQueueLength(c));
107 +        assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
108 +        assertEquals(threads.length, lock.getWaitingThreads(c).size());
109 +        assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
110 +                     new HashSet<Thread>(Arrays.asList(threads)));
111 +        lock.writeLock().unlock();
112 +    }
113 +
114 +    /**
115       * Constructor sets given fairness, and is in unlocked state
116       */
117      public void testConstructor() {
118 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
118 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
119          assertFalse(rl.isFair());
120          assertFalse(rl.isWriteLocked());
121          assertEquals(0, rl.getReadLockCount());
122 <        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
122 >        ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
123          assertTrue(r2.isFair());
124          assertFalse(r2.isWriteLocked());
125          assertEquals(0, r2.getReadLockCount());
126 <        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
126 >        ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
127          assertFalse(r3.isFair());
128          assertFalse(r3.isWriteLocked());
129          assertEquals(0, r3.getReadLockCount());
# Line 79 | Line 133 | public class ReentrantReadWriteLockTest
133       * write-locking and read-locking an unlocked lock succeed
134       */
135      public void testLock() {
136 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
136 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
137          rl.writeLock().lock();
138          assertTrue(rl.isWriteLocked());
139          assertTrue(rl.isWriteLockedByCurrentThread());
# Line 100 | Line 154 | public class ReentrantReadWriteLockTest
154          assertEquals(0, rl.getReadLockCount());
155      }
156  
103
157      /**
158       * locking an unlocked fair lock succeeds
159       */
160      public void testFairLock() {
161 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
161 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
162          rl.writeLock().lock();
163          assertTrue(rl.isWriteLocked());
164          assertTrue(rl.isWriteLockedByCurrentThread());
# Line 130 | Line 183 | public class ReentrantReadWriteLockTest
183       * getWriteHoldCount returns number of recursive holds
184       */
185      public void testGetWriteHoldCount() {
186 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
187 <        for (int i = 1; i <= SIZE; i++) {
188 <            lock.writeLock().lock();
189 <            assertEquals(i,lock.getWriteHoldCount());
190 <        }
191 <        for (int i = SIZE; i > 0; i--) {
192 <            lock.writeLock().unlock();
193 <            assertEquals(i-1,lock.getWriteHoldCount());
194 <        }
186 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
187 >        for (int i = 1; i <= SIZE; i++) {
188 >            lock.writeLock().lock();
189 >            assertEquals(i,lock.getWriteHoldCount());
190 >        }
191 >        for (int i = SIZE; i > 0; i--) {
192 >            lock.writeLock().unlock();
193 >            assertEquals(i-1,lock.getWriteHoldCount());
194 >        }
195      }
196  
197      /**
198       * WriteLock.getHoldCount returns number of recursive holds
199       */
200      public void testGetHoldCount() {
201 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
202 <        for (int i = 1; i <= SIZE; i++) {
203 <            lock.writeLock().lock();
204 <            assertEquals(i,lock.writeLock().getHoldCount());
205 <        }
206 <        for (int i = SIZE; i > 0; i--) {
207 <            lock.writeLock().unlock();
208 <            assertEquals(i-1,lock.writeLock().getHoldCount());
209 <        }
201 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
202 >        for (int i = 1; i <= SIZE; i++) {
203 >            lock.writeLock().lock();
204 >            assertEquals(i,lock.writeLock().getHoldCount());
205 >        }
206 >        for (int i = SIZE; i > 0; i--) {
207 >            lock.writeLock().unlock();
208 >            assertEquals(i-1,lock.writeLock().getHoldCount());
209 >        }
210      }
211  
212      /**
213       * getReadHoldCount returns number of recursive holds
214       */
215      public void testGetReadHoldCount() {
216 <        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
217 <        for (int i = 1; i <= SIZE; i++) {
218 <            lock.readLock().lock();
219 <            assertEquals(i,lock.getReadHoldCount());
220 <        }
221 <        for (int i = SIZE; i > 0; i--) {
222 <            lock.readLock().unlock();
223 <            assertEquals(i-1,lock.getReadHoldCount());
224 <        }
216 >        ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
217 >        for (int i = 1; i <= SIZE; i++) {
218 >            lock.readLock().lock();
219 >            assertEquals(i,lock.getReadHoldCount());
220 >        }
221 >        for (int i = SIZE; i > 0; i--) {
222 >            lock.readLock().unlock();
223 >            assertEquals(i-1,lock.getReadHoldCount());
224 >        }
225      }
226  
174
227      /**
228       * write-unlocking an unlocked lock throws IllegalMonitorStateException
229       */
230 <    public void testUnlock_IllegalMonitorStateException() {
231 <        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
232 <        try {
233 <            rl.writeLock().unlock();
234 <            shouldThrow();
235 <        } catch (IllegalMonitorStateException success) {}
230 >    public void testWriteUnlock_IllegalMonitorStateException() {
231 >        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
232 >        try {
233 >            rl.writeLock().unlock();
234 >            shouldThrow();
235 >        } catch (IllegalMonitorStateException success) {}
236      }
237  
238 +    /**
239 +     * read-unlocking an unlocked lock throws IllegalMonitorStateException
240 +     */
241 +    public void testReadUnlock_IllegalMonitorStateException() {
242 +        ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
243 +        try {
244 +            rl.readLock().unlock();
245 +            shouldThrow();
246 +        } catch (IllegalMonitorStateException success) {}
247 +    }
248  
249      /**
250       * write-lockInterruptibly is interruptible
251       */
252      public void testWriteLockInterruptibly_Interrupted() throws Exception {
253 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
254 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
253 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
254 >        lock.writeLock().lock();
255 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
256              public void realRun() throws InterruptedException {
257                  lock.writeLock().lockInterruptibly();
195                lock.writeLock().unlock();
196                lock.writeLock().lockInterruptibly();
197                lock.writeLock().unlock();
258              }});
259  
260 <        lock.writeLock().lock();
201 <        t.start();
202 <        Thread.sleep(SHORT_DELAY_MS);
260 >        waitForQueuedThread(lock, t);
261          t.interrupt();
262 <        Thread.sleep(SHORT_DELAY_MS);
263 <        lock.writeLock().unlock();
206 <        t.join();
262 >        awaitTermination(t);
263 >        releaseWriteLock(lock);
264      }
265  
266      /**
267       * timed write-tryLock is interruptible
268       */
269      public void testWriteTryLock_Interrupted() throws InterruptedException {
270 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
271 <        lock.writeLock().lock();
272 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
270 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
271 >        lock.writeLock().lock();
272 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
273              public void realRun() throws InterruptedException {
274 <                lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS);
274 >                lock.writeLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
275              }});
276  
277 <        t.start();
277 >        waitForQueuedThread(lock, t);
278          t.interrupt();
279 <        lock.writeLock().unlock();
280 <        t.join();
279 >        awaitTermination(t);
280 >        releaseWriteLock(lock);
281      }
282  
283      /**
284       * read-lockInterruptibly is interruptible
285       */
286      public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
287 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
288 <        lock.writeLock().lock();
289 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
287 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
288 >        lock.writeLock().lock();
289 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
290              public void realRun() throws InterruptedException {
291                  lock.readLock().lockInterruptibly();
292              }});
293  
294 <        t.start();
238 <        Thread.sleep(SHORT_DELAY_MS);
294 >        waitForQueuedThread(lock, t);
295          t.interrupt();
296 <        Thread.sleep(SHORT_DELAY_MS);
297 <        lock.writeLock().unlock();
242 <        t.join();
296 >        awaitTermination(t);
297 >        releaseWriteLock(lock);
298      }
299  
300      /**
301       * timed read-tryLock is interruptible
302       */
303      public void testReadTryLock_Interrupted() throws InterruptedException {
304 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
305 <        lock.writeLock().lock();
306 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
304 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
305 >        lock.writeLock().lock();
306 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
307              public void realRun() throws InterruptedException {
308 <                lock.readLock().tryLock(1000,TimeUnit.MILLISECONDS);
308 >                lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
309              }});
310  
311 <        t.start();
311 >        waitForQueuedThread(lock, t);
312          t.interrupt();
313 <        t.join();
313 >        awaitTermination(t);
314 >        releaseWriteLock(lock);
315      }
316  
261
317      /**
318       * write-tryLock fails if locked
319       */
320      public void testWriteTryLockWhenLocked() throws InterruptedException {
321 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
322 <        lock.writeLock().lock();
323 <        Thread t = new Thread(new Runnable() {
324 <                public void run() {
325 <                    threadAssertFalse(lock.writeLock().tryLock());
326 <                }
272 <            });
321 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
322 >        lock.writeLock().lock();
323 >        Thread t = newStartedThread(new CheckedRunnable() {
324 >            public void realRun() {
325 >                assertFalse(lock.writeLock().tryLock());
326 >            }});
327  
328 <        t.start();
329 <        t.join();
276 <        lock.writeLock().unlock();
328 >        awaitTermination(t);
329 >        releaseWriteLock(lock);
330      }
331  
332      /**
333       * read-tryLock fails if locked
334       */
335      public void testReadTryLockWhenLocked() throws InterruptedException {
336 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
337 <        lock.writeLock().lock();
338 <        Thread t = new Thread(new Runnable() {
339 <                public void run() {
340 <                    threadAssertFalse(lock.readLock().tryLock());
341 <                }
289 <            });
336 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
337 >        lock.writeLock().lock();
338 >        Thread t = newStartedThread(new CheckedRunnable() {
339 >            public void realRun() {
340 >                assertFalse(lock.readLock().tryLock());
341 >            }});
342  
343 <        t.start();
344 <        t.join();
293 <        lock.writeLock().unlock();
343 >        awaitTermination(t);
344 >        releaseWriteLock(lock);
345      }
346  
347      /**
348       * Multiple threads can hold a read lock when not write-locked
349       */
350      public void testMultipleReadLocks() throws InterruptedException {
351 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
352 <        lock.readLock().lock();
353 <        Thread t = new Thread(new Runnable() {
354 <                public void run() {
355 <                    threadAssertTrue(lock.readLock().tryLock());
356 <                    lock.readLock().unlock();
357 <                }
307 <            });
351 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
352 >        lock.readLock().lock();
353 >        Thread t = newStartedThread(new CheckedRunnable() {
354 >            public void realRun() {
355 >                assertTrue(lock.readLock().tryLock());
356 >                lock.readLock().unlock();
357 >            }});
358  
359 <        t.start();
310 <        t.join();
359 >        awaitTermination(t);
360          lock.readLock().unlock();
361      }
362  
363      /**
364 <     * A writelock succeeds after reading threads unlock
364 >     * A writelock succeeds only after reading threads unlock
365       */
366      public void testWriteAfterMultipleReadLocks() throws InterruptedException {
367 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
368 <        lock.readLock().lock();
369 <        Thread t1 = new Thread(new Runnable() {
370 <                public void run() {
371 <                    lock.readLock().lock();
372 <                    lock.readLock().unlock();
373 <                }
374 <            });
375 <        Thread t2 = new Thread(new Runnable() {
376 <                public void run() {
377 <                    lock.writeLock().lock();
378 <                    lock.writeLock().unlock();
379 <                }
331 <            });
332 <
333 <        t1.start();
334 <        t2.start();
335 <        Thread.sleep(SHORT_DELAY_MS);
367 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
368 >        lock.readLock().lock();
369 >        Thread t1 = newStartedThread(new CheckedRunnable() {
370 >            public void realRun() {
371 >                lock.readLock().lock();
372 >                lock.readLock().unlock();
373 >            }});
374 >        Thread t2 = newStartedThread(new CheckedRunnable() {
375 >            public void realRun() {
376 >                lock.writeLock().lock();
377 >                lock.writeLock().unlock();
378 >            }});
379 >        delay(SHORT_DELAY_MS);
380          lock.readLock().unlock();
381 <        t1.join(MEDIUM_DELAY_MS);
382 <        t2.join(MEDIUM_DELAY_MS);
383 <        assertTrue(!t1.isAlive());
340 <        assertTrue(!t2.isAlive());
381 >        awaitTermination(t1);
382 >        awaitTermination(t2);
383 >        assertNotWriteLocked(lock);
384      }
385  
386      /**
387 <     * Readlocks succeed after a writing thread unlocks
387 >     * Readlocks succeed only after a writing thread unlocks
388       */
389      public void testReadAfterWriteLock() throws InterruptedException {
390 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
391 <        lock.writeLock().lock();
392 <        Thread t1 = new Thread(new Runnable() {
393 <                public void run() {
394 <                    lock.readLock().lock();
395 <                    lock.readLock().unlock();
396 <                }
397 <            });
398 <        Thread t2 = new Thread(new Runnable() {
399 <                public void run() {
400 <                    lock.readLock().lock();
401 <                    lock.readLock().unlock();
359 <                }
360 <            });
390 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
391 >        lock.writeLock().lock();
392 >        Thread t1 = newStartedThread(new CheckedRunnable() {
393 >            public void realRun() {
394 >                lock.readLock().lock();
395 >                lock.readLock().unlock();
396 >            }});
397 >        Thread t2 = newStartedThread(new CheckedRunnable() {
398 >            public void realRun() {
399 >                lock.readLock().lock();
400 >                lock.readLock().unlock();
401 >            }});
402  
403 <        t1.start();
404 <        t2.start();
405 <        Thread.sleep(SHORT_DELAY_MS);
406 <        lock.writeLock().unlock();
407 <        t1.join(MEDIUM_DELAY_MS);
367 <        t2.join(MEDIUM_DELAY_MS);
368 <        assertTrue(!t1.isAlive());
369 <        assertTrue(!t2.isAlive());
403 >        waitForQueuedThread(lock, t1);
404 >        waitForQueuedThread(lock, t2);
405 >        releaseWriteLock(lock);
406 >        awaitTermination(t1);
407 >        awaitTermination(t2);
408      }
409  
410      /**
411       * Read trylock succeeds if write locked by current thread
412       */
413      public void testReadHoldingWriteLock() {
414 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
415 <        lock.writeLock().lock();
414 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
415 >        lock.writeLock().lock();
416          assertTrue(lock.readLock().tryLock());
417          lock.readLock().unlock();
418          lock.writeLock().unlock();
# Line 385 | Line 423 | public class ReentrantReadWriteLockTest
423       * other threads are waiting for readlock
424       */
425      public void testReadHoldingWriteLock2() throws InterruptedException {
426 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
427 <        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();
426 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
427 >        lock.writeLock().lock();
428          lock.readLock().lock();
429          lock.readLock().unlock();
430 <        Thread.sleep(SHORT_DELAY_MS);
430 >
431 >        Thread t1 = newStartedThread(new CheckedRunnable() {
432 >            public void realRun() {
433 >                lock.readLock().lock();
434 >                lock.readLock().unlock();
435 >            }});
436 >        Thread t2 = newStartedThread(new CheckedRunnable() {
437 >            public void realRun() {
438 >                lock.readLock().lock();
439 >                lock.readLock().unlock();
440 >            }});
441 >
442 >        waitForQueuedThread(lock, t1);
443 >        waitForQueuedThread(lock, t2);
444 >        assertTrue(lock.isWriteLockedByCurrentThread());
445          lock.readLock().lock();
446          lock.readLock().unlock();
447 <        lock.writeLock().unlock();
448 <        t1.join(MEDIUM_DELAY_MS);
449 <        t2.join(MEDIUM_DELAY_MS);
413 <        assertTrue(!t1.isAlive());
414 <        assertTrue(!t2.isAlive());
447 >        releaseWriteLock(lock);
448 >        awaitTermination(t1);
449 >        awaitTermination(t2);
450      }
451  
452      /**
453 <     *  Read lock succeeds if write locked by current thread even if
453 >     * Read lock succeeds if write locked by current thread even if
454       * other threads are waiting for writelock
455       */
456      public void testReadHoldingWriteLock3() throws InterruptedException {
457 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
458 <        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();
457 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
458 >        lock.writeLock().lock();
459          lock.readLock().lock();
460          lock.readLock().unlock();
461 <        Thread.sleep(SHORT_DELAY_MS);
461 >
462 >        Thread t1 = newStartedThread(new CheckedRunnable() {
463 >            public void realRun() {
464 >                lock.writeLock().lock();
465 >                lock.writeLock().unlock();
466 >            }});
467 >        Thread t2 = newStartedThread(new CheckedRunnable() {
468 >            public void realRun() {
469 >                lock.writeLock().lock();
470 >                lock.writeLock().unlock();
471 >            }});
472 >
473 >        waitForQueuedThread(lock, t1);
474 >        waitForQueuedThread(lock, t2);
475 >        assertTrue(lock.isWriteLockedByCurrentThread());
476          lock.readLock().lock();
477          lock.readLock().unlock();
478 <        lock.writeLock().unlock();
479 <        t1.join(MEDIUM_DELAY_MS);
480 <        t2.join(MEDIUM_DELAY_MS);
447 <        assertTrue(!t1.isAlive());
448 <        assertTrue(!t2.isAlive());
478 >        releaseWriteLock(lock);
479 >        awaitTermination(t1);
480 >        awaitTermination(t2);
481      }
482  
451
483      /**
484 <     *  Write lock succeeds if write locked by current thread even if
484 >     * Write lock succeeds if write locked by current thread even if
485       * other threads are waiting for writelock
486       */
487      public void testWriteHoldingWriteLock4() throws InterruptedException {
488 <        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();
488 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
489          lock.writeLock().lock();
475        lock.writeLock().unlock();
476        Thread.sleep(SHORT_DELAY_MS);
490          lock.writeLock().lock();
491          lock.writeLock().unlock();
492 +
493 +        Thread t1 = newStartedThread(new CheckedRunnable() {
494 +            public void realRun() {
495 +                lock.writeLock().lock();
496 +                lock.writeLock().unlock();
497 +            }});
498 +        Thread t2 = newStartedThread(new CheckedRunnable() {
499 +            public void realRun() {
500 +                lock.writeLock().lock();
501 +                lock.writeLock().unlock();
502 +            }});
503 +
504 +        waitForQueuedThread(lock, t1);
505 +        waitForQueuedThread(lock, t2);
506 +        assertTrue(lock.isWriteLockedByCurrentThread());
507 +        assertEquals(1, lock.getWriteHoldCount());
508 +        lock.writeLock().lock();
509 +        assertTrue(lock.isWriteLockedByCurrentThread());
510 +        assertEquals(2, lock.getWriteHoldCount());
511          lock.writeLock().unlock();
512 <        t1.join(MEDIUM_DELAY_MS);
513 <        t2.join(MEDIUM_DELAY_MS);
514 <        assertTrue(!t1.isAlive());
483 <        assertTrue(!t2.isAlive());
512 >        releaseWriteLock(lock);
513 >        awaitTermination(t1);
514 >        awaitTermination(t2);
515      }
516  
486
517      /**
518       * Fair Read trylock succeeds if write locked by current thread
519       */
520      public void testReadHoldingWriteLockFair() {
521 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
522 <        lock.writeLock().lock();
521 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
522 >        lock.writeLock().lock();
523          assertTrue(lock.readLock().tryLock());
524          lock.readLock().unlock();
525          lock.writeLock().unlock();
# Line 500 | Line 530 | public class ReentrantReadWriteLockTest
530       * other threads are waiting for readlock
531       */
532      public void testReadHoldingWriteLockFair2() throws InterruptedException {
533 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
534 <        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();
533 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
534 >        lock.writeLock().lock();
535          lock.readLock().lock();
536          lock.readLock().unlock();
537 <        Thread.sleep(SHORT_DELAY_MS);
537 >
538 >        Thread t1 = newStartedThread(new CheckedRunnable() {
539 >            public void realRun() {
540 >                lock.readLock().lock();
541 >                lock.readLock().unlock();
542 >            }});
543 >        Thread t2 = newStartedThread(new CheckedRunnable() {
544 >            public void realRun() {
545 >                lock.readLock().lock();
546 >                lock.readLock().unlock();
547 >            }});
548 >
549 >        waitForQueuedThread(lock, t1);
550 >        waitForQueuedThread(lock, t2);
551 >        assertTrue(lock.isWriteLockedByCurrentThread());
552          lock.readLock().lock();
553          lock.readLock().unlock();
554 <        lock.writeLock().unlock();
555 <        t1.join(MEDIUM_DELAY_MS);
556 <        t2.join(MEDIUM_DELAY_MS);
528 <        assertTrue(!t1.isAlive());
529 <        assertTrue(!t2.isAlive());
554 >        releaseWriteLock(lock);
555 >        awaitTermination(t1);
556 >        awaitTermination(t2);
557      }
558  
532
559      /**
560       * Fair Read lock succeeds if write locked by current thread even if
561       * other threads are waiting for writelock
562       */
563      public void testReadHoldingWriteLockFair3() throws InterruptedException {
564 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
565 <        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();
564 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
565 >        lock.writeLock().lock();
566          lock.readLock().lock();
567          lock.readLock().unlock();
568 <        Thread.sleep(SHORT_DELAY_MS);
568 >
569 >        Thread t1 = newStartedThread(new CheckedRunnable() {
570 >            public void realRun() {
571 >                lock.writeLock().lock();
572 >                lock.writeLock().unlock();
573 >            }});
574 >        Thread t2 = newStartedThread(new CheckedRunnable() {
575 >            public void realRun() {
576 >                lock.writeLock().lock();
577 >                lock.writeLock().unlock();
578 >            }});
579 >
580 >        waitForQueuedThread(lock, t1);
581 >        waitForQueuedThread(lock, t2);
582 >        assertTrue(lock.isWriteLockedByCurrentThread());
583          lock.readLock().lock();
584          lock.readLock().unlock();
585 <        lock.writeLock().unlock();
586 <        t1.join(MEDIUM_DELAY_MS);
587 <        t2.join(MEDIUM_DELAY_MS);
563 <        assertTrue(!t1.isAlive());
564 <        assertTrue(!t2.isAlive());
585 >        releaseWriteLock(lock);
586 >        awaitTermination(t1);
587 >        awaitTermination(t2);
588      }
589  
567
590      /**
591       * Fair Write lock succeeds if write locked by current thread even if
592       * other threads are waiting for writelock
593       */
594      public void testWriteHoldingWriteLockFair4() throws InterruptedException {
595 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
596 <        lock.writeLock().lock();
597 <        Thread t1 = new Thread(new Runnable() {
598 <                public void run() {
599 <                    lock.writeLock().lock();
600 <                    lock.writeLock().unlock();
601 <                }
602 <            });
603 <        Thread t2 = new Thread(new Runnable() {
604 <                public void run() {
605 <                    lock.writeLock().lock();
606 <                    lock.writeLock().unlock();
585 <                }
586 <            });
595 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
596 >        lock.writeLock().lock();
597 >        Thread t1 = newStartedThread(new CheckedRunnable() {
598 >            public void realRun() {
599 >                lock.writeLock().lock();
600 >                lock.writeLock().unlock();
601 >            }});
602 >        Thread t2 = newStartedThread(new CheckedRunnable() {
603 >            public void realRun() {
604 >                lock.writeLock().lock();
605 >                lock.writeLock().unlock();
606 >            }});
607  
608 <        t1.start();
609 <        t2.start();
590 <        Thread.sleep(SHORT_DELAY_MS);
608 >        waitForQueuedThread(lock, t1);
609 >        waitForQueuedThread(lock, t2);
610          assertTrue(lock.isWriteLockedByCurrentThread());
611 <        assertTrue(lock.getWriteHoldCount() == 1);
611 >        assertEquals(1, lock.getWriteHoldCount());
612          lock.writeLock().lock();
613 <        assertTrue(lock.getWriteHoldCount() == 2);
613 >        assertEquals(2, lock.getWriteHoldCount());
614          lock.writeLock().unlock();
615          lock.writeLock().lock();
616          lock.writeLock().unlock();
617 <        lock.writeLock().unlock();
618 <        t1.join(MEDIUM_DELAY_MS);
619 <        t2.join(MEDIUM_DELAY_MS);
601 <        assertTrue(!t1.isAlive());
602 <        assertTrue(!t2.isAlive());
617 >        releaseWriteLock(lock);
618 >        awaitTermination(t1);
619 >        awaitTermination(t2);
620      }
621  
605
622      /**
623       * Read tryLock succeeds if readlocked but not writelocked
624       */
625      public void testTryLockWhenReadLocked() throws InterruptedException {
626 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
627 <        lock.readLock().lock();
628 <        Thread t = new Thread(new Runnable() {
629 <                public void run() {
630 <                    threadAssertTrue(lock.readLock().tryLock());
631 <                    lock.readLock().unlock();
632 <                }
617 <            });
626 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
627 >        lock.readLock().lock();
628 >        Thread t = newStartedThread(new CheckedRunnable() {
629 >            public void realRun() {
630 >                assertTrue(lock.readLock().tryLock());
631 >                lock.readLock().unlock();
632 >            }});
633  
634 <        t.start();
620 <        t.join();
634 >        awaitTermination(t);
635          lock.readLock().unlock();
636      }
637  
624
625
638      /**
639       * write tryLock fails when readlocked
640       */
641      public void testWriteTryLockWhenReadLocked() throws InterruptedException {
642 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
643 <        lock.readLock().lock();
644 <        Thread t = new Thread(new Runnable() {
645 <                public void run() {
646 <                    threadAssertFalse(lock.writeLock().tryLock());
647 <                }
636 <            });
642 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
643 >        lock.readLock().lock();
644 >        Thread t = newStartedThread(new CheckedRunnable() {
645 >            public void realRun() {
646 >                assertFalse(lock.writeLock().tryLock());
647 >            }});
648  
649 <        t.start();
639 <        t.join();
649 >        awaitTermination(t);
650          lock.readLock().unlock();
651      }
652  
643
653      /**
654       * Fair Read tryLock succeeds if readlocked but not writelocked
655       */
656      public void testTryLockWhenReadLockedFair() throws InterruptedException {
657 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
658 <        lock.readLock().lock();
659 <        Thread t = new Thread(new Runnable() {
660 <                public void run() {
661 <                    threadAssertTrue(lock.readLock().tryLock());
662 <                    lock.readLock().unlock();
663 <                }
655 <            });
657 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
658 >        lock.readLock().lock();
659 >        Thread t = newStartedThread(new CheckedRunnable() {
660 >            public void realRun() {
661 >                assertTrue(lock.readLock().tryLock());
662 >                lock.readLock().unlock();
663 >            }});
664  
665 <        t.start();
658 <        t.join();
665 >        awaitTermination(t);
666          lock.readLock().unlock();
667      }
668  
662
663
669      /**
670       * Fair write tryLock fails when readlocked
671       */
672      public void testWriteTryLockWhenReadLockedFair() throws InterruptedException {
673 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
674 <        lock.readLock().lock();
675 <        Thread t = new Thread(new Runnable() {
676 <                public void run() {
677 <                    threadAssertFalse(lock.writeLock().tryLock());
678 <                }
674 <            });
673 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
674 >        lock.readLock().lock();
675 >        Thread t = newStartedThread(new CheckedRunnable() {
676 >            public void realRun() {
677 >                assertFalse(lock.writeLock().tryLock());
678 >            }});
679  
680 <        t.start();
677 <        t.join();
680 >        awaitTermination(t);
681          lock.readLock().unlock();
682      }
683  
681
682
684      /**
685       * write timed tryLock times out if locked
686       */
687      public void testWriteTryLock_Timeout() throws InterruptedException {
688 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
689 <        lock.writeLock().lock();
690 <        Thread t = new Thread(new CheckedRunnable() {
688 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
689 >        lock.writeLock().lock();
690 >        Thread t = newStartedThread(new CheckedRunnable() {
691              public void realRun() throws InterruptedException {
692 <                threadAssertFalse(lock.writeLock().tryLock(1, TimeUnit.MILLISECONDS));
692 >                assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
693              }});
694  
695 <        t.start();
695 <        t.join();
695 >        awaitTermination(t);
696          assertTrue(lock.writeLock().isHeldByCurrentThread());
697          lock.writeLock().unlock();
698      }
# Line 701 | Line 701 | public class ReentrantReadWriteLockTest
701       * read timed tryLock times out if write-locked
702       */
703      public void testReadTryLock_Timeout() throws InterruptedException {
704 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
705 <        lock.writeLock().lock();
706 <        Thread t = new Thread(new CheckedRunnable() {
704 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
705 >        lock.writeLock().lock();
706 >        Thread t = newStartedThread(new CheckedRunnable() {
707              public void realRun() throws InterruptedException {
708 <                threadAssertFalse(lock.readLock().tryLock(1, TimeUnit.MILLISECONDS));
708 >                assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
709              }});
710  
711 <        t.start();
712 <        t.join();
711 >        awaitTermination(t);
712          assertTrue(lock.writeLock().isHeldByCurrentThread());
713          lock.writeLock().unlock();
714      }
715  
717
716      /**
717       * write lockInterruptibly succeeds if lock free else is interruptible
718       */
719      public void testWriteLockInterruptibly() throws InterruptedException {
720 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
720 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
721          lock.writeLock().lockInterruptibly();
722 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
722 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
723              public void realRun() throws InterruptedException {
724                  lock.writeLock().lockInterruptibly();
725              }});
726  
727 <        t.start();
730 <        Thread.sleep(SHORT_DELAY_MS);
727 >        waitForQueuedThread(lock, t);
728          t.interrupt();
729 <        Thread.sleep(SHORT_DELAY_MS);
730 <        t.join();
734 <        lock.writeLock().unlock();
729 >        awaitTermination(t);
730 >        releaseWriteLock(lock);
731      }
732  
733      /**
734 <     *  read lockInterruptibly succeeds if lock free else is interruptible
734 >     * read lockInterruptibly succeeds if lock free else is interruptible
735       */
736      public void testReadLockInterruptibly() throws InterruptedException {
737 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
737 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
738          lock.writeLock().lockInterruptibly();
739 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
739 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
740              public void realRun() throws InterruptedException {
741                  lock.readLock().lockInterruptibly();
742              }});
743  
744 <        t.start();
749 <        Thread.sleep(SHORT_DELAY_MS);
744 >        waitForQueuedThread(lock, t);
745          t.interrupt();
746 <        t.join();
747 <        lock.writeLock().unlock();
746 >        awaitTermination(t);
747 >        releaseWriteLock(lock);
748      }
749  
750      /**
751       * Calling await without holding lock throws IllegalMonitorStateException
752       */
753      public void testAwait_IllegalMonitor() throws InterruptedException {
754 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
754 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
755          final Condition c = lock.writeLock().newCondition();
756          try {
757              c.await();
758              shouldThrow();
759          } catch (IllegalMonitorStateException success) {}
760 +        try {
761 +            c.await(LONG_DELAY_MS, MILLISECONDS);
762 +            shouldThrow();
763 +        } catch (IllegalMonitorStateException success) {}
764 +        try {
765 +            c.awaitNanos(100);
766 +            shouldThrow();
767 +        } catch (IllegalMonitorStateException success) {}
768 +        try {
769 +            c.awaitUninterruptibly();
770 +            shouldThrow();
771 +        } catch (IllegalMonitorStateException success) {}
772      }
773  
774      /**
775       * Calling signal without holding lock throws IllegalMonitorStateException
776       */
777      public void testSignal_IllegalMonitor() {
778 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
778 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
779          final Condition c = lock.writeLock().newCondition();
780          try {
781              c.signal();
# Line 777 | Line 784 | public class ReentrantReadWriteLockTest
784      }
785  
786      /**
787 +     * Calling signalAll without holding lock throws IllegalMonitorStateException
788 +     */
789 +    public void testSignalAll_IllegalMonitor() {
790 +        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
791 +        final Condition c = lock.writeLock().newCondition();
792 +        try {
793 +            c.signalAll();
794 +            shouldThrow();
795 +        } catch (IllegalMonitorStateException success) {}
796 +    }
797 +
798 +    /**
799       * awaitNanos without a signal times out
800       */
801      public void testAwaitNanos_Timeout() throws InterruptedException {
802 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
802 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
803          final Condition c = lock.writeLock().newCondition();
785
804          lock.writeLock().lock();
805 <        long t = c.awaitNanos(100);
806 <        assertTrue(t <= 0);
805 >        long startTime = System.nanoTime();
806 >        long timeoutMillis = 10;
807 >        long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
808 >        long nanosRemaining = c.awaitNanos(timeoutNanos);
809 >        assertTrue(nanosRemaining <= 0);
810 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
811          lock.writeLock().unlock();
812      }
813  
792
814      /**
815 <     *  timed await without a signal times out
815 >     * timed await without a signal times out
816       */
817      public void testAwait_Timeout() throws InterruptedException {
818 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
818 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
819          final Condition c = lock.writeLock().newCondition();
820          lock.writeLock().lock();
821 <        assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
821 >        long startTime = System.nanoTime();
822 >        long timeoutMillis = 10;
823 >        assertFalse(c.await(timeoutMillis, MILLISECONDS));
824 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
825          lock.writeLock().unlock();
826      }
827  
# Line 805 | Line 829 | public class ReentrantReadWriteLockTest
829       * awaitUntil without a signal times out
830       */
831      public void testAwaitUntil_Timeout() throws InterruptedException {
832 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
832 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
833          final Condition c = lock.writeLock().newCondition();
834          lock.writeLock().lock();
835          java.util.Date d = new java.util.Date();
# Line 817 | Line 841 | public class ReentrantReadWriteLockTest
841       * await returns when signalled
842       */
843      public void testAwait() throws InterruptedException {
844 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
844 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
845          final Condition c = lock.writeLock().newCondition();
846 <        Thread t = new Thread(new CheckedRunnable() {
846 >        final CountDownLatch locked = new CountDownLatch(1);
847 >        Thread t = newStartedThread(new CheckedRunnable() {
848              public void realRun() throws InterruptedException {
849                  lock.writeLock().lock();
850 +                locked.countDown();
851                  c.await();
852                  lock.writeLock().unlock();
853              }});
854  
855 <        t.start();
830 <        Thread.sleep(SHORT_DELAY_MS);
855 >        locked.await();
856          lock.writeLock().lock();
857          c.signal();
858 +        assertTrue(t.isAlive());
859          lock.writeLock().unlock();
860 <        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 <        }
860 >        awaitTermination(t);
861      }
862  
863      /**
# Line 868 | Line 866 | public class ReentrantReadWriteLockTest
866      public void testAwaitUninterruptibly() throws InterruptedException {
867          final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
868          final Condition c = lock.writeLock().newCondition();
869 <        UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
870 <
871 <        thread.start();
872 <
873 <        while (!thread.lockStarted) {
874 <            Thread.sleep(100);
875 <        }
869 >        final CountDownLatch locked = new CountDownLatch(1);
870 >        final AtomicBoolean canAwake = new AtomicBoolean(false);
871 >        Thread t = newStartedThread(new CheckedRunnable() {
872 >            public void realRun() {
873 >                lock.writeLock().lock();
874 >                locked.countDown();
875 >                c.awaitUninterruptibly();
876 >                assertTrue(Thread.interrupted());
877 >                lock.writeLock().unlock();
878 >            }});
879  
880 +        locked.await();
881          lock.writeLock().lock();
882 <        try {
883 <            thread.interrupt();
884 <            thread.canAwake = true;
885 <            c.signal();
886 <        } finally {
887 <            lock.writeLock().unlock();
888 <        }
889 <
888 <        thread.join();
889 <        assertTrue(thread.interrupted);
890 <        assertFalse(thread.isAlive());
882 >        lock.writeLock().unlock();
883 >        t.interrupt();
884 >        t.join(10);
885 >        assertTrue(t.isAlive());
886 >        lock.writeLock().lock();
887 >        c.signal();
888 >        lock.writeLock().unlock();
889 >        awaitTermination(t);
890      }
891  
892      /**
893       * await is interruptible
894       */
895      public void testAwait_Interrupt() throws InterruptedException {
896 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
896 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
897          final Condition c = lock.writeLock().newCondition();
898 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
898 >        final CountDownLatch locked = new CountDownLatch(1);
899 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
900              public void realRun() throws InterruptedException {
901                  lock.writeLock().lock();
902 <                c.await();
903 <                lock.writeLock().unlock();
902 >                assertTrue(lock.isWriteLocked());
903 >                assertTrue(lock.isWriteLockedByCurrentThread());
904 >                assertHasNoWaiters(lock, c);
905 >                locked.countDown();
906 >                try {
907 >                    c.await();
908 >                } finally {
909 >                    assertTrue(lock.isWriteLocked());
910 >                    assertTrue(lock.isWriteLockedByCurrentThread());
911 >                    assertHasNoWaiters(lock, c);
912 >                    lock.writeLock().unlock();
913 >                    assertFalse(Thread.interrupted());
914 >                }
915              }});
916  
917 <        t.start();
918 <        Thread.sleep(SHORT_DELAY_MS);
917 >        locked.await();
918 >        assertHasWaiters(lock, c, t);
919          t.interrupt();
920 <        t.join(SHORT_DELAY_MS);
921 <        assertFalse(t.isAlive());
920 >        awaitTermination(t);
921 >        assertFalse(lock.isWriteLocked());
922      }
923  
924      /**
925       * awaitNanos is interruptible
926       */
927      public void testAwaitNanos_Interrupt() throws InterruptedException {
928 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
928 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
929          final Condition c = lock.writeLock().newCondition();
930 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
930 >        final CountDownLatch locked = new CountDownLatch(1);
931 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
932              public void realRun() throws InterruptedException {
933                  lock.writeLock().lock();
934 <                c.awaitNanos(SHORT_DELAY_MS * 2 * 1000000);
935 <                lock.writeLock().unlock();
934 >                assertTrue(lock.isWriteLocked());
935 >                assertTrue(lock.isWriteLockedByCurrentThread());
936 >                assertHasNoWaiters(lock, c);
937 >                locked.countDown();
938 >                try {
939 >                    c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
940 >                } finally {
941 >                    assertTrue(lock.isWriteLocked());
942 >                    assertTrue(lock.isWriteLockedByCurrentThread());
943 >                    assertHasNoWaiters(lock, c);
944 >                    lock.writeLock().unlock();
945 >                    assertFalse(Thread.interrupted());
946 >                }
947              }});
948  
949 <        t.start();
950 <        Thread.sleep(SHORT_DELAY_MS);
949 >        locked.await();
950 >        assertHasWaiters(lock, c, t);
951          t.interrupt();
952 <        t.join(SHORT_DELAY_MS);
953 <        assertFalse(t.isAlive());
952 >        awaitTermination(t);
953 >        assertFalse(lock.isWriteLocked());
954      }
955  
956      /**
957       * awaitUntil is interruptible
958       */
959      public void testAwaitUntil_Interrupt() throws InterruptedException {
960 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
960 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
961          final Condition c = lock.writeLock().newCondition();
962 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
962 >        final CountDownLatch locked = new CountDownLatch(1);
963 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
964              public void realRun() throws InterruptedException {
965                  lock.writeLock().lock();
966 +                assertTrue(lock.isWriteLocked());
967 +                assertTrue(lock.isWriteLockedByCurrentThread());
968 +                assertHasNoWaiters(lock, c);
969 +                locked.countDown();
970                  java.util.Date d = new java.util.Date();
971 <                c.awaitUntil(new java.util.Date(d.getTime() + 10000));
972 <                lock.writeLock().unlock();
971 >                try {
972 >                    c.awaitUntil(new java.util.Date(d.getTime() + 10000));
973 >                } finally {
974 >                    assertTrue(lock.isWriteLocked());
975 >                    assertTrue(lock.isWriteLockedByCurrentThread());
976 >                    assertHasNoWaiters(lock, c);
977 >                    lock.writeLock().unlock();
978 >                    assertFalse(Thread.interrupted());
979 >                }
980              }});
981  
982 <        t.start();
983 <        Thread.sleep(SHORT_DELAY_MS);
982 >        locked.await();
983 >        assertHasWaiters(lock, c, t);
984          t.interrupt();
985 <        t.join(SHORT_DELAY_MS);
986 <        assertFalse(t.isAlive());
985 >        awaitTermination(t);
986 >        assertFalse(lock.isWriteLocked());
987      }
988  
989      /**
990       * signalAll wakes up all threads
991       */
992      public void testSignalAll() throws InterruptedException {
993 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
993 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
994          final Condition c = lock.writeLock().newCondition();
995 <        Thread t1 = new Thread(new CheckedRunnable() {
995 >        final CountDownLatch locked = new CountDownLatch(2);
996 >        final Lock writeLock = lock.writeLock();
997 >        Thread t1 = newStartedThread(new CheckedRunnable() {
998              public void realRun() throws InterruptedException {
999 <                lock.writeLock().lock();
999 >                writeLock.lock();
1000 >                locked.countDown();
1001                  c.await();
1002 <                lock.writeLock().unlock();
1002 >                writeLock.unlock();
1003              }});
1004  
1005 <        Thread t2 = new Thread(new CheckedRunnable() {
1005 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1006              public void realRun() throws InterruptedException {
1007 <                lock.writeLock().lock();
1007 >                writeLock.lock();
1008 >                locked.countDown();
1009                  c.await();
1010 <                lock.writeLock().unlock();
1010 >                writeLock.unlock();
1011              }});
1012  
1013 <        t1.start();
1014 <        t2.start();
1015 <        Thread.sleep(SHORT_DELAY_MS);
977 <        lock.writeLock().lock();
1013 >        locked.await();
1014 >        writeLock.lock();
1015 >        assertHasWaiters(lock, c, t1, t2);
1016          c.signalAll();
1017 <        lock.writeLock().unlock();
1018 <        t1.join(SHORT_DELAY_MS);
1019 <        t2.join(SHORT_DELAY_MS);
1020 <        assertFalse(t1.isAlive());
1021 <        assertFalse(t2.isAlive());
1017 >        assertHasNoWaiters(lock, c);
1018 >        writeLock.unlock();
1019 >        awaitTermination(t1);
1020 >        awaitTermination(t2);
1021 >    }
1022 >
1023 >    /**
1024 >     * signal wakes up waiting threads in FIFO order.
1025 >     */
1026 >    public void testSignalWakesFifo() throws InterruptedException {
1027 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1028 >        final Condition c = lock.writeLock().newCondition();
1029 >        final CountDownLatch locked1 = new CountDownLatch(1);
1030 >        final CountDownLatch locked2 = new CountDownLatch(1);
1031 >        final Lock writeLock = lock.writeLock();
1032 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1033 >            public void realRun() throws InterruptedException {
1034 >                writeLock.lock();
1035 >                locked1.countDown();
1036 >                c.await();
1037 >                writeLock.unlock();
1038 >            }});
1039 >
1040 >        locked1.await();
1041 >
1042 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1043 >            public void realRun() throws InterruptedException {
1044 >                writeLock.lock();
1045 >                locked2.countDown();
1046 >                c.await();
1047 >                writeLock.unlock();
1048 >            }});
1049 >
1050 >        locked2.await();
1051 >
1052 >        writeLock.lock();
1053 >        assertHasWaiters(lock, c, t1, t2);
1054 >        assertFalse(lock.hasQueuedThreads());
1055 >        c.signal();
1056 >        assertHasWaiters(lock, c, t2);
1057 >        assertTrue(lock.hasQueuedThread(t1));
1058 >        assertFalse(lock.hasQueuedThread(t2));
1059 >        c.signal();
1060 >        assertHasNoWaiters(lock, c);
1061 >        assertTrue(lock.hasQueuedThread(t1));
1062 >        assertTrue(lock.hasQueuedThread(t2));
1063 >        writeLock.unlock();
1064 >        awaitTermination(t1);
1065 >        awaitTermination(t2);
1066      }
1067  
1068      /**
# Line 1007 | Line 1089 | public class ReentrantReadWriteLockTest
1089       * hasQueuedThreads reports whether there are waiting threads
1090       */
1091      public void testhasQueuedThreads() throws InterruptedException {
1092 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1092 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1093          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1094          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1095          assertFalse(lock.hasQueuedThreads());
1096          lock.writeLock().lock();
1097 +        assertFalse(lock.hasQueuedThreads());
1098 +        long startTime = System.nanoTime();
1099          t1.start();
1100 <        Thread.sleep(SHORT_DELAY_MS);
1017 <        assertTrue(lock.hasQueuedThreads());
1100 >        waitForQueuedThread(lock, t1);
1101          t2.start();
1102 <        Thread.sleep(SHORT_DELAY_MS);
1102 >        waitForQueuedThread(lock, t2);
1103          assertTrue(lock.hasQueuedThreads());
1104          t1.interrupt();
1105 <        Thread.sleep(SHORT_DELAY_MS);
1105 >        awaitTermination(t1);
1106          assertTrue(lock.hasQueuedThreads());
1107          lock.writeLock().unlock();
1108 <        Thread.sleep(SHORT_DELAY_MS);
1108 >        awaitTermination(t2);
1109          assertFalse(lock.hasQueuedThreads());
1027        t1.join();
1028        t2.join();
1110      }
1111  
1112      /**
1113       * hasQueuedThread(null) throws NPE
1114       */
1115      public void testHasQueuedThreadNPE() {
1116 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1116 >        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1117          try {
1118              sync.hasQueuedThread(null);
1119              shouldThrow();
# Line 1043 | Line 1124 | public class ReentrantReadWriteLockTest
1124       * hasQueuedThread reports whether a thread is queued.
1125       */
1126      public void testHasQueuedThread() throws InterruptedException {
1127 <        final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1128 <        Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1129 <        Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1130 <        assertFalse(sync.hasQueuedThread(t1));
1131 <        assertFalse(sync.hasQueuedThread(t2));
1132 <        sync.writeLock().lock();
1127 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1128 >        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1129 >        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1130 >        assertFalse(lock.hasQueuedThread(t1));
1131 >        assertFalse(lock.hasQueuedThread(t2));
1132 >        lock.writeLock().lock();
1133 >        long startTime = System.nanoTime();
1134          t1.start();
1135 <        Thread.sleep(SHORT_DELAY_MS);
1136 <        assertTrue(sync.hasQueuedThread(t1));
1135 >        waitForQueuedThread(lock, t1);
1136 >        assertTrue(lock.hasQueuedThread(t1));
1137 >        assertFalse(lock.hasQueuedThread(t2));
1138          t2.start();
1139 <        Thread.sleep(SHORT_DELAY_MS);
1140 <        assertTrue(sync.hasQueuedThread(t1));
1141 <        assertTrue(sync.hasQueuedThread(t2));
1139 >        waitForQueuedThread(lock, t2);
1140 >        assertTrue(lock.hasQueuedThread(t1));
1141 >        assertTrue(lock.hasQueuedThread(t2));
1142          t1.interrupt();
1143 <        Thread.sleep(SHORT_DELAY_MS);
1144 <        assertFalse(sync.hasQueuedThread(t1));
1145 <        assertTrue(sync.hasQueuedThread(t2));
1146 <        sync.writeLock().unlock();
1147 <        Thread.sleep(SHORT_DELAY_MS);
1148 <        assertFalse(sync.hasQueuedThread(t1));
1149 <        Thread.sleep(SHORT_DELAY_MS);
1067 <        assertFalse(sync.hasQueuedThread(t2));
1068 <        t1.join();
1069 <        t2.join();
1143 >        awaitTermination(t1);
1144 >        assertFalse(lock.hasQueuedThread(t1));
1145 >        assertTrue(lock.hasQueuedThread(t2));
1146 >        lock.writeLock().unlock();
1147 >        awaitTermination(t2);
1148 >        assertFalse(lock.hasQueuedThread(t1));
1149 >        assertFalse(lock.hasQueuedThread(t2));
1150      }
1151  
1072
1152      /**
1153       * getQueueLength reports number of waiting threads
1154       */
1155      public void testGetQueueLength() throws InterruptedException {
1156 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1156 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1157          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1158          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1159          assertEquals(0, lock.getQueueLength());
1160          lock.writeLock().lock();
1161 +        long startTime = System.nanoTime();
1162          t1.start();
1163 <        Thread.sleep(SHORT_DELAY_MS);
1163 >        waitForQueuedThread(lock, t1);
1164          assertEquals(1, lock.getQueueLength());
1165          t2.start();
1166 <        Thread.sleep(SHORT_DELAY_MS);
1166 >        waitForQueuedThread(lock, t2);
1167          assertEquals(2, lock.getQueueLength());
1168          t1.interrupt();
1169 <        Thread.sleep(SHORT_DELAY_MS);
1169 >        awaitTermination(t1);
1170          assertEquals(1, lock.getQueueLength());
1171          lock.writeLock().unlock();
1172 <        Thread.sleep(SHORT_DELAY_MS);
1172 >        awaitTermination(t2);
1173          assertEquals(0, lock.getQueueLength());
1094        t1.join();
1095        t2.join();
1174      }
1175  
1176      /**
1177       * getQueuedThreads includes waiting threads
1178       */
1179      public void testGetQueuedThreads() throws InterruptedException {
1180 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1180 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1181          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1182          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1183          assertTrue(lock.getQueuedThreads().isEmpty());
1184          lock.writeLock().lock();
1185 +        long startTime = System.nanoTime();
1186          assertTrue(lock.getQueuedThreads().isEmpty());
1187          t1.start();
1188 <        Thread.sleep(SHORT_DELAY_MS);
1188 >        waitForQueuedThread(lock, t1);
1189 >        assertEquals(1, lock.getQueuedThreads().size());
1190          assertTrue(lock.getQueuedThreads().contains(t1));
1191          t2.start();
1192 <        Thread.sleep(SHORT_DELAY_MS);
1192 >        waitForQueuedThread(lock, t2);
1193 >        assertEquals(2, lock.getQueuedThreads().size());
1194          assertTrue(lock.getQueuedThreads().contains(t1));
1195          assertTrue(lock.getQueuedThreads().contains(t2));
1196          t1.interrupt();
1197 <        Thread.sleep(SHORT_DELAY_MS);
1197 >        awaitTermination(t1);
1198          assertFalse(lock.getQueuedThreads().contains(t1));
1199          assertTrue(lock.getQueuedThreads().contains(t2));
1200 +        assertEquals(1, lock.getQueuedThreads().size());
1201          lock.writeLock().unlock();
1202 <        Thread.sleep(SHORT_DELAY_MS);
1202 >        awaitTermination(t2);
1203          assertTrue(lock.getQueuedThreads().isEmpty());
1122        t1.join();
1123        t2.join();
1204      }
1205  
1206      /**
1207       * hasWaiters throws NPE if null
1208       */
1209      public void testHasWaitersNPE() {
1210 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1210 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1211          try {
1212              lock.hasWaiters(null);
1213              shouldThrow();
# Line 1138 | Line 1218 | public class ReentrantReadWriteLockTest
1218       * getWaitQueueLength throws NPE if null
1219       */
1220      public void testGetWaitQueueLengthNPE() {
1221 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1221 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1222          try {
1223              lock.getWaitQueueLength(null);
1224              shouldThrow();
1225          } catch (NullPointerException success) {}
1226      }
1227  
1148
1228      /**
1229       * getWaitingThreads throws NPE if null
1230       */
1231      public void testGetWaitingThreadsNPE() {
1232 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1232 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1233          try {
1234              lock.getWaitingThreads(null);
1235              shouldThrow();
# Line 1161 | Line 1240 | public class ReentrantReadWriteLockTest
1240       * hasWaiters throws IAE if not owned
1241       */
1242      public void testHasWaitersIAE() {
1243 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1243 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1244          final Condition c = lock.writeLock().newCondition();
1245 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1245 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1246          try {
1247              lock2.hasWaiters(c);
1248              shouldThrow();
# Line 1174 | Line 1253 | public class ReentrantReadWriteLockTest
1253       * hasWaiters throws IMSE if not locked
1254       */
1255      public void testHasWaitersIMSE() {
1256 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1256 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1257          final Condition c = lock.writeLock().newCondition();
1258          try {
1259              lock.hasWaiters(c);
# Line 1182 | Line 1261 | public class ReentrantReadWriteLockTest
1261          } catch (IllegalMonitorStateException success) {}
1262      }
1263  
1185
1264      /**
1265       * getWaitQueueLength throws IAE if not owned
1266       */
1267      public void testGetWaitQueueLengthIAE() {
1268 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1268 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1269          final Condition c = lock.writeLock().newCondition();
1270 <        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1270 >        final ReentrantReadWriteLock lock2 = new ReentrantReadWriteLock();
1271          try {
1272              lock2.getWaitQueueLength(c);
1273              shouldThrow();
# Line 1200 | Line 1278 | public class ReentrantReadWriteLockTest
1278       * getWaitQueueLength throws IMSE if not locked
1279       */
1280      public void testGetWaitQueueLengthIMSE() {
1281 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1281 >        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1282          final Condition c = lock.writeLock().newCondition();
1283          try {
1284              lock.getWaitQueueLength(c);
# Line 1208 | Line 1286 | public class ReentrantReadWriteLockTest
1286          } catch (IllegalMonitorStateException success) {}
1287      }
1288  
1211
1289      /**
1290       * getWaitingThreads throws IAE if not owned
1291       */
1292      public void testGetWaitingThreadsIAE() {
1293 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1293 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1294          final Condition c = lock.writeLock().newCondition();
1295 <        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1295 >        final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1296          try {
1297              lock2.getWaitingThreads(c);
1298              shouldThrow();
# Line 1226 | Line 1303 | public class ReentrantReadWriteLockTest
1303       * getWaitingThreads throws IMSE if not locked
1304       */
1305      public void testGetWaitingThreadsIMSE() {
1306 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1306 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1307          final Condition c = lock.writeLock().newCondition();
1308          try {
1309              lock.getWaitingThreads(c);
# Line 1234 | Line 1311 | public class ReentrantReadWriteLockTest
1311          } catch (IllegalMonitorStateException success) {}
1312      }
1313  
1237
1314      /**
1315       * hasWaiters returns true when a thread is waiting, else false
1316       */
1317      public void testHasWaiters() throws InterruptedException {
1318 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1318 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1319          final Condition c = lock.writeLock().newCondition();
1320 <        Thread t = new Thread(new CheckedRunnable() {
1320 >        final CountDownLatch locked = new CountDownLatch(1);
1321 >        Thread t = newStartedThread(new CheckedRunnable() {
1322              public void realRun() throws InterruptedException {
1323                  lock.writeLock().lock();
1324 <                threadAssertFalse(lock.hasWaiters(c));
1325 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
1324 >                assertFalse(lock.hasWaiters(c));
1325 >                locked.countDown();
1326 >                assertEquals(0, lock.getWaitQueueLength(c));
1327                  c.await();
1328                  lock.writeLock().unlock();
1329              }});
1330  
1331 <        t.start();
1254 <        Thread.sleep(SHORT_DELAY_MS);
1331 >        locked.await();
1332          lock.writeLock().lock();
1333          assertTrue(lock.hasWaiters(c));
1334          assertEquals(1, lock.getWaitQueueLength(c));
1335          c.signal();
1336 +        assertHasNoWaiters(lock, c);
1337          lock.writeLock().unlock();
1338 <        Thread.sleep(SHORT_DELAY_MS);
1339 <        lock.writeLock().lock();
1262 <        assertFalse(lock.hasWaiters(c));
1263 <        assertEquals(0, lock.getWaitQueueLength(c));
1264 <        lock.writeLock().unlock();
1265 <        t.join(SHORT_DELAY_MS);
1266 <        assertFalse(t.isAlive());
1338 >        awaitTermination(t);
1339 >        assertHasNoWaiters(lock, c);
1340      }
1341  
1342      /**
1343       * getWaitQueueLength returns number of waiting threads
1344       */
1345      public void testGetWaitQueueLength() throws InterruptedException {
1346 <        final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1346 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1347          final Condition c = lock.writeLock().newCondition();
1348 <        Thread t = new Thread(new CheckedRunnable() {
1348 >        final CountDownLatch locked = new CountDownLatch(1);
1349 >        Thread t = newStartedThread(new CheckedRunnable() {
1350              public void realRun() throws InterruptedException {
1351                  lock.writeLock().lock();
1352 <                threadAssertFalse(lock.hasWaiters(c));
1353 <                threadAssertEquals(0, lock.getWaitQueueLength(c));
1352 >                assertEquals(0, lock.getWaitQueueLength(c));
1353 >                locked.countDown();
1354                  c.await();
1355                  lock.writeLock().unlock();
1356              }});
1357  
1358 <        t.start();
1285 <        Thread.sleep(SHORT_DELAY_MS);
1358 >        locked.await();
1359          lock.writeLock().lock();
1360 <        assertTrue(lock.hasWaiters(c));
1360 >        assertHasWaiters(lock, c, t);
1361          assertEquals(1, lock.getWaitQueueLength(c));
1362          c.signal();
1363 <        lock.writeLock().unlock();
1291 <        Thread.sleep(SHORT_DELAY_MS);
1292 <        lock.writeLock().lock();
1293 <        assertFalse(lock.hasWaiters(c));
1363 >        assertHasNoWaiters(lock, c);
1364          assertEquals(0, lock.getWaitQueueLength(c));
1365          lock.writeLock().unlock();
1366 <        t.join(SHORT_DELAY_MS);
1297 <        assertFalse(t.isAlive());
1366 >        awaitTermination(t);
1367      }
1368  
1300
1369      /**
1370       * getWaitingThreads returns only and all waiting threads
1371       */
1372      public void testGetWaitingThreads() throws InterruptedException {
1373 <        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1373 >        final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1374          final Condition c = lock.writeLock().newCondition();
1375 <        Thread t1 = new Thread(new CheckedRunnable() {
1375 >        final CountDownLatch locked1 = new CountDownLatch(1);
1376 >        final CountDownLatch locked2 = new CountDownLatch(1);
1377 >        Thread t1 = new Thread(new CheckedRunnable() {
1378              public void realRun() throws InterruptedException {
1379                  lock.writeLock().lock();
1380 <                threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
1380 >                assertTrue(lock.getWaitingThreads(c).isEmpty());
1381 >                locked1.countDown();
1382                  c.await();
1383                  lock.writeLock().unlock();
1384              }});
1385  
1386 <        Thread t2 = new Thread(new CheckedRunnable() {
1386 >        Thread t2 = new Thread(new CheckedRunnable() {
1387              public void realRun() throws InterruptedException {
1388                  lock.writeLock().lock();
1389 <                threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
1389 >                assertFalse(lock.getWaitingThreads(c).isEmpty());
1390 >                locked2.countDown();
1391                  c.await();
1392                  lock.writeLock().unlock();
1393              }});
# Line 1323 | Line 1395 | public class ReentrantReadWriteLockTest
1395          lock.writeLock().lock();
1396          assertTrue(lock.getWaitingThreads(c).isEmpty());
1397          lock.writeLock().unlock();
1398 +
1399          t1.start();
1400 <        Thread.sleep(SHORT_DELAY_MS);
1400 >        locked1.await();
1401          t2.start();
1402 <        Thread.sleep(SHORT_DELAY_MS);
1402 >        locked2.await();
1403 >
1404          lock.writeLock().lock();
1405          assertTrue(lock.hasWaiters(c));
1406          assertTrue(lock.getWaitingThreads(c).contains(t1));
1407          assertTrue(lock.getWaitingThreads(c).contains(t2));
1408 +        assertEquals(2, lock.getWaitingThreads(c).size());
1409          c.signalAll();
1410 +        assertHasNoWaiters(lock, c);
1411          lock.writeLock().unlock();
1412 <        Thread.sleep(SHORT_DELAY_MS);
1413 <        lock.writeLock().lock();
1414 <        assertFalse(lock.hasWaiters(c));
1415 <        assertTrue(lock.getWaitingThreads(c).isEmpty());
1416 <        lock.writeLock().unlock();
1341 <        t1.join(SHORT_DELAY_MS);
1342 <        t2.join(SHORT_DELAY_MS);
1343 <        assertFalse(t1.isAlive());
1344 <        assertFalse(t2.isAlive());
1412 >
1413 >        awaitTermination(t1);
1414 >        awaitTermination(t2);
1415 >
1416 >        assertHasNoWaiters(lock, c);
1417      }
1418  
1419      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines