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.45 by jsr166, Sun May 1 23:49:41 2011 UTC vs.
Revision 1.77 by jsr166, Fri Jul 3 01:25:15 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines