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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines