ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ReentrantReadWriteLockTest.java

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.45 by jsr166, Sun May 1 23:49:41 2011 UTC vs.
Revision 1.58 by jsr166, Sat May 7 14:43:13 2011 UTC

#	Line 7 | Line 7
7		*/
8
9		import junit.framework.*;
10	+	import java.util.concurrent.atomic.AtomicBoolean;
11		import java.util.concurrent.locks.*;
12		import java.util.concurrent.*;
13		import static java.util.concurrent.TimeUnit.MILLISECONDS;
#	Line 32 | Line 33 | public class ReentrantReadWriteLockTest
33		}
34		}
35
35	–
36		/**
37		* A runnable calling lockInterruptibly that expects to be
38		* interrupted
#	Line 50 | Line 50 | public class ReentrantReadWriteLockTest
50		*/
51		static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
52		PublicReentrantReadWriteLock() { super(); }
53	+	PublicReentrantReadWriteLock(boolean fair) { super(fair); }
54	+	public Thread getOwner() {
55	+	return super.getOwner();
56	+	}
57		public Collection<Thread> getQueuedThreads() {
58		return super.getQueuedThreads();
59		}
#	Line 59 | Line 63 | public class ReentrantReadWriteLockTest
63		}
64
65		/**
66	+	* Releases write lock, checking that it had a hold count of 1.
67	+	*/
68	+	void releaseWriteLock(PublicReentrantReadWriteLock lock) {
69	+	ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
70	+	assertWriteLockedBy(lock, Thread.currentThread());
71	+	assertEquals(1, lock.getWriteHoldCount());
72	+	writeLock.unlock();
73	+	assertNotWriteLocked(lock);
74	+	}
75	+
76	+	/**
77	+	* Spin-waits until lock.hasQueuedThread(t) becomes true.
78	+	*/
79	+	void waitForQueuedThread(PublicReentrantReadWriteLock lock, Thread t) {
80	+	long startTime = System.nanoTime();
81	+	while (!lock.hasQueuedThread(t)) {
82	+	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
83	+	throw new AssertionError("timed out");
84	+	Thread.yield();
85	+	}
86	+	assertTrue(t.isAlive());
87	+	assertTrue(lock.getOwner() != t);
88	+	}
89	+
90	+	/**
91	+	* Checks that lock is not write-locked.
92	+	*/
93	+	void assertNotWriteLocked(PublicReentrantReadWriteLock lock) {
94	+	assertFalse(lock.isWriteLocked());
95	+	assertFalse(lock.isWriteLockedByCurrentThread());
96	+	assertFalse(lock.writeLock().isHeldByCurrentThread());
97	+	assertNull(lock.getOwner());
98	+	assertEquals(0, lock.getWriteHoldCount());
99	+	}
100	+
101	+	/**
102	+	* Checks that lock is write-locked by the given thread.
103	+	*/
104	+	void assertWriteLockedBy(PublicReentrantReadWriteLock lock, Thread t) {
105	+	assertTrue(lock.isWriteLocked());
106	+	assertSame(t, lock.getOwner());
107	+	assertEquals(t == Thread.currentThread(),
108	+	lock.isWriteLockedByCurrentThread());
109	+	assertEquals(t == Thread.currentThread(),
110	+	lock.writeLock().isHeldByCurrentThread());
111	+	assertEquals(t == Thread.currentThread(),
112	+	lock.getWriteHoldCount() > 0);
113	+	assertEquals(0, lock.getReadLockCount());
114	+	}
115	+
116	+	/**
117	+	* Checks that condition c has no waiters.
118	+	*/
119	+	void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
120	+	assertHasWaiters(lock, c, new Thread[] {});
121	+	}
122	+
123	+	/**
124	+	* Checks that condition c has exactly the given waiter threads.
125	+	*/
126	+	void assertHasWaiters(PublicReentrantReadWriteLock lock, Condition c,
127	+	Thread... threads) {
128	+	lock.writeLock().lock();
129	+	assertEquals(threads.length > 0, lock.hasWaiters(c));
130	+	assertEquals(threads.length, lock.getWaitQueueLength(c));
131	+	assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
132	+	assertEquals(threads.length, lock.getWaitingThreads(c).size());
133	+	assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
134	+	new HashSet<Thread>(Arrays.asList(threads)));
135	+	lock.writeLock().unlock();
136	+	}
137	+
138	+	/**
139		* Constructor sets given fairness, and is in unlocked state
140		*/
141		public void testConstructor() {
142	<	ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
143	<	assertFalse(rl.isFair());
144	<	assertFalse(rl.isWriteLocked());
145	<	assertEquals(0, rl.getReadLockCount());
146	<	ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
147	<	assertTrue(r2.isFair());
148	<	assertFalse(r2.isWriteLocked());
149	<	assertEquals(0, r2.getReadLockCount());
150	<	ReentrantReadWriteLock r3 = new ReentrantReadWriteLock(false);
151	<	assertFalse(r3.isFair());
152	<	assertFalse(r3.isWriteLocked());
153	<	assertEquals(0, r3.getReadLockCount());
142	>	PublicReentrantReadWriteLock lock;
143	>
144	>	lock = new PublicReentrantReadWriteLock();
145	>	assertFalse(lock.isFair());
146	>	assertNotWriteLocked(lock);
147	>	assertEquals(0, lock.getReadLockCount());
148	>
149	>	lock = new PublicReentrantReadWriteLock(true);
150	>	assertTrue(lock.isFair());
151	>	assertNotWriteLocked(lock);
152	>	assertEquals(0, lock.getReadLockCount());
153	>
154	>	lock = new PublicReentrantReadWriteLock(false);
155	>	assertFalse(lock.isFair());
156	>	assertNotWriteLocked(lock);
157	>	assertEquals(0, lock.getReadLockCount());
158		}
159
160		/**
161		* write-locking and read-locking an unlocked lock succeed
162		*/
163		public void testLock() {
164	<	ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
165	<	rl.writeLock().lock();
166	<	assertTrue(rl.isWriteLocked());
167	<	assertTrue(rl.isWriteLockedByCurrentThread());
168	<	assertTrue(rl.writeLock().isHeldByCurrentThread());
169	<	assertEquals(0, rl.getReadLockCount());
170	<	rl.writeLock().unlock();
171	<	assertFalse(rl.isWriteLocked());
172	<	assertFalse(rl.isWriteLockedByCurrentThread());
173	<	assertFalse(rl.writeLock().isHeldByCurrentThread());
174	<	assertEquals(0, rl.getReadLockCount());
175	<	rl.readLock().lock();
176	<	assertFalse(rl.isWriteLocked());
96	<	assertFalse(rl.isWriteLockedByCurrentThread());
97	<	assertEquals(1, rl.getReadLockCount());
98	<	rl.readLock().unlock();
99	<	assertFalse(rl.isWriteLocked());
100	<	assertFalse(rl.isWriteLockedByCurrentThread());
101	<	assertEquals(0, rl.getReadLockCount());
164	>	PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
165	>	assertNotWriteLocked(lock);
166	>	lock.writeLock().lock();
167	>	assertWriteLockedBy(lock, Thread.currentThread());
168	>	lock.writeLock().unlock();
169	>	assertNotWriteLocked(lock);
170	>	assertEquals(0, lock.getReadLockCount());
171	>	lock.readLock().lock();
172	>	assertNotWriteLocked(lock);
173	>	assertEquals(1, lock.getReadLockCount());
174	>	lock.readLock().unlock();
175	>	assertNotWriteLocked(lock);
176	>	assertEquals(0, lock.getReadLockCount());
177		}
178
104	–
179		/**
180		* locking an unlocked fair lock succeeds
181		*/
182		public void testFairLock() {
183	<	ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
184	<	rl.writeLock().lock();
185	<	assertTrue(rl.isWriteLocked());
186	<	assertTrue(rl.isWriteLockedByCurrentThread());
187	<	assertTrue(rl.writeLock().isHeldByCurrentThread());
188	<	assertEquals(0, rl.getReadLockCount());
189	<	rl.writeLock().unlock();
190	<	assertFalse(rl.isWriteLocked());
191	<	assertFalse(rl.isWriteLockedByCurrentThread());
192	<	assertFalse(rl.writeLock().isHeldByCurrentThread());
193	<	assertEquals(0, rl.getReadLockCount());
194	<	rl.readLock().lock();
195	<	assertFalse(rl.isWriteLocked());
122	<	assertFalse(rl.isWriteLockedByCurrentThread());
123	<	assertEquals(1, rl.getReadLockCount());
124	<	rl.readLock().unlock();
125	<	assertFalse(rl.isWriteLocked());
126	<	assertFalse(rl.isWriteLockedByCurrentThread());
127	<	assertEquals(0, rl.getReadLockCount());
183	>	PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
184	>	assertNotWriteLocked(lock);
185	>	lock.writeLock().lock();
186	>	assertWriteLockedBy(lock, Thread.currentThread());
187	>	lock.writeLock().unlock();
188	>	assertNotWriteLocked(lock);
189	>	assertEquals(0, lock.getReadLockCount());
190	>	lock.readLock().lock();
191	>	assertNotWriteLocked(lock);
192	>	assertEquals(1, lock.getReadLockCount());
193	>	lock.readLock().unlock();
194	>	assertNotWriteLocked(lock);
195	>	assertEquals(0, lock.getReadLockCount());
196		}
197
198		/**
#	Line 172 | Line 240 | public class ReentrantReadWriteLockTest
240		}
241		}
242
175	–
243		/**
244		* write-unlocking an unlocked lock throws IllegalMonitorStateException
245		*/
246	<	public void testUnlock_IllegalMonitorStateException() {
247	<	ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
246	>	public void testWriteUnlock_IllegalMonitorStateException() {
247	>	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
248		try {
249	<	rl.writeLock().unlock();
249	>	lock.writeLock().unlock();
250		shouldThrow();
251		} catch (IllegalMonitorStateException success) {}
252		}
253
254	+	/**
255	+	* read-unlocking an unlocked lock throws IllegalMonitorStateException
256	+	*/
257	+	public void testReadUnlock_IllegalMonitorStateException() {
258	+	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
259	+	try {
260	+	lock.readLock().unlock();
261	+	shouldThrow();
262	+	} catch (IllegalMonitorStateException success) {}
263	+	}
264
265		/**
266		* write-lockInterruptibly is interruptible
267		*/
268		public void testWriteLockInterruptibly_Interrupted() throws Exception {
269	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
269	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
270		lock.writeLock().lock();
271		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
272		public void realRun() throws InterruptedException {
273		lock.writeLock().lockInterruptibly();
197	–	lock.writeLock().unlock();
198	–	lock.writeLock().lockInterruptibly();
199	–	lock.writeLock().unlock();
274		}});
275
276	<	Thread.sleep(SHORT_DELAY_MS);
276	>	waitForQueuedThread(lock, t);
277		t.interrupt();
278	<	Thread.sleep(SHORT_DELAY_MS);
279	<	lock.writeLock().unlock();
206	<	t.join();
278	>	awaitTermination(t);
279	>	releaseWriteLock(lock);
280		}
281
282		/**
283		* timed write-tryLock is interruptible
284		*/
285		public void testWriteTryLock_Interrupted() throws InterruptedException {
286	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
286	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
287		lock.writeLock().lock();
288		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
289		public void realRun() throws InterruptedException {
290	<	lock.writeLock().tryLock(SMALL_DELAY_MS, MILLISECONDS);
290	>	lock.writeLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
291		}});
292
293	<	Thread.sleep(SHORT_DELAY_MS);
293	>	waitForQueuedThread(lock, t);
294		t.interrupt();
295	<	lock.writeLock().unlock();
296	<	t.join();
295	>	awaitTermination(t);
296	>	releaseWriteLock(lock);
297		}
298
299		/**
300		* read-lockInterruptibly is interruptible
301		*/
302		public void testReadLockInterruptibly_Interrupted() throws InterruptedException {
303	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
303	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
304		lock.writeLock().lock();
305		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
306		public void realRun() throws InterruptedException {
307		lock.readLock().lockInterruptibly();
308		}});
309
310	<	Thread.sleep(SHORT_DELAY_MS);
310	>	waitForQueuedThread(lock, t);
311		t.interrupt();
312	<	Thread.sleep(SHORT_DELAY_MS);
313	<	lock.writeLock().unlock();
241	<	t.join();
312	>	awaitTermination(t);
313	>	releaseWriteLock(lock);
314		}
315
316		/**
317		* timed read-tryLock is interruptible
318		*/
319		public void testReadTryLock_Interrupted() throws InterruptedException {
320	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
320	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
321		lock.writeLock().lock();
322		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
323		public void realRun() throws InterruptedException {
324		lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
325		}});
326
327	<	Thread.sleep(SHORT_DELAY_MS);
327	>	waitForQueuedThread(lock, t);
328		t.interrupt();
329	<	t.join();
329	>	awaitTermination(t);
330	>	releaseWriteLock(lock);
331		}
332
260	–
333		/**
334		* write-tryLock fails if locked
335		*/
336		public void testWriteTryLockWhenLocked() throws InterruptedException {
337	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
337	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
338		lock.writeLock().lock();
339		Thread t = newStartedThread(new CheckedRunnable() {
340		public void realRun() {
341		assertFalse(lock.writeLock().tryLock());
342		}});
343
344	<	t.join();
345	<	lock.writeLock().unlock();
344	>	awaitTermination(t);
345	>	releaseWriteLock(lock);
346		}
347
348		/**
349		* read-tryLock fails if locked
350		*/
351		public void testReadTryLockWhenLocked() throws InterruptedException {
352	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
352	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
353		lock.writeLock().lock();
354		Thread t = newStartedThread(new CheckedRunnable() {
355		public void realRun() {
356		assertFalse(lock.readLock().tryLock());
357		}});
358
359	<	t.join();
360	<	lock.writeLock().unlock();
359	>	awaitTermination(t);
360	>	releaseWriteLock(lock);
361		}
362
363		/**
#	Line 300 | Line 372 | public class ReentrantReadWriteLockTest
372		lock.readLock().unlock();
373		}});
374
375	<	t.join();
375	>	awaitTermination(t);
376		lock.readLock().unlock();
377		}
378
379		/**
380	<	* A writelock succeeds after reading threads unlock
380	>	* A writelock succeeds only after a reading thread unlocks
381	>	*/
382	>	public void testWriteAfterReadLock() throws InterruptedException {
383	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
384	>	lock.readLock().lock();
385	>
386	>	Thread t = newStartedThread(new CheckedRunnable() {
387	>	public void realRun() {
388	>	assertEquals(1, lock.getReadLockCount());
389	>	lock.writeLock().lock();
390	>	assertEquals(0, lock.getReadLockCount());
391	>	lock.writeLock().unlock();
392	>	}});
393	>	waitForQueuedThread(lock, t);
394	>	assertNotWriteLocked(lock);
395	>	assertEquals(1, lock.getReadLockCount());
396	>	lock.readLock().unlock();
397	>	assertEquals(0, lock.getReadLockCount());
398	>	awaitTermination(t);
399	>	assertNotWriteLocked(lock);
400	>	}
401	>
402	>	/**
403	>	* A writelock succeeds only after reading threads unlock
404		*/
405		public void testWriteAfterMultipleReadLocks() throws InterruptedException {
406	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
406	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
407	>	lock.readLock().lock();
408		lock.readLock().lock();
409		Thread t1 = newStartedThread(new CheckedRunnable() {
410		public void realRun() {
411		lock.readLock().lock();
412	+	assertEquals(3, lock.getReadLockCount());
413		lock.readLock().unlock();
414		}});
415	+	awaitTermination(t1);
416	+
417		Thread t2 = newStartedThread(new CheckedRunnable() {
418		public void realRun() {
419	+	assertEquals(2, lock.getReadLockCount());
420	+	lock.writeLock().lock();
421	+	assertEquals(0, lock.getReadLockCount());
422	+	lock.writeLock().unlock();
423	+	}});
424	+	waitForQueuedThread(lock, t2);
425	+	assertNotWriteLocked(lock);
426	+	assertEquals(2, lock.getReadLockCount());
427	+	lock.readLock().unlock();
428	+	lock.readLock().unlock();
429	+	assertEquals(0, lock.getReadLockCount());
430	+	awaitTermination(t2);
431	+	assertNotWriteLocked(lock);
432	+	}
433	+
434	+	/**
435	+	* A thread that tries to acquire a fair read lock (non-reentrantly)
436	+	* will block if there is a waiting writer thread.
437	+	*/
438	+	public void testReaderWriterReaderFairFifo() throws InterruptedException {
439	+	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
440	+	final AtomicBoolean t1GotLock = new AtomicBoolean(false);
441	+
442	+	lock.readLock().lock();
443	+	Thread t1 = newStartedThread(new CheckedRunnable() {
444	+	public void realRun() {
445	+	assertEquals(1, lock.getReadLockCount());
446		lock.writeLock().lock();
447	+	assertEquals(0, lock.getReadLockCount());
448	+	t1GotLock.set(true);
449		lock.writeLock().unlock();
450		}});
451	+	waitForQueuedThread(lock, t1);
452
453	<	Thread.sleep(SHORT_DELAY_MS);
453	>	Thread t2 = newStartedThread(new CheckedRunnable() {
454	>	public void realRun() {
455	>	assertEquals(1, lock.getReadLockCount());
456	>	lock.readLock().lock();
457	>	assertEquals(1, lock.getReadLockCount());
458	>	assertTrue(t1GotLock.get());
459	>	lock.readLock().unlock();
460	>	}});
461	>	waitForQueuedThread(lock, t2);
462	>	assertTrue(t1.isAlive());
463	>	assertNotWriteLocked(lock);
464	>	assertEquals(1, lock.getReadLockCount());
465		lock.readLock().unlock();
466	<	t1.join(MEDIUM_DELAY_MS);
467	<	t2.join(MEDIUM_DELAY_MS);
468	<	assertTrue(!t1.isAlive());
329	<	assertTrue(!t2.isAlive());
466	>	awaitTermination(t1);
467	>	awaitTermination(t2);
468	>	assertNotWriteLocked(lock);
469		}
470
471		/**
472	<	* Readlocks succeed after a writing thread unlocks
472	>	* Readlocks succeed only after a writing thread unlocks
473		*/
474		public void testReadAfterWriteLock() throws InterruptedException {
475	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
475	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
476		lock.writeLock().lock();
477		Thread t1 = newStartedThread(new CheckedRunnable() {
478		public void realRun() {
#	Line 346 | Line 485 | public class ReentrantReadWriteLockTest
485		lock.readLock().unlock();
486		}});
487
488	<	Thread.sleep(SHORT_DELAY_MS);
489	<	lock.writeLock().unlock();
490	<	t1.join(MEDIUM_DELAY_MS);
491	<	t2.join(MEDIUM_DELAY_MS);
492	<	assertTrue(!t1.isAlive());
354	<	assertTrue(!t2.isAlive());
488	>	waitForQueuedThread(lock, t1);
489	>	waitForQueuedThread(lock, t2);
490	>	releaseWriteLock(lock);
491	>	awaitTermination(t1);
492	>	awaitTermination(t2);
493		}
494
495		/**
#	Line 370 | Line 508 | public class ReentrantReadWriteLockTest
508		* other threads are waiting for readlock
509		*/
510		public void testReadHoldingWriteLock2() throws InterruptedException {
511	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
511	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
512		lock.writeLock().lock();
513	+	lock.readLock().lock();
514	+	lock.readLock().unlock();
515	+
516		Thread t1 = newStartedThread(new CheckedRunnable() {
517		public void realRun() {
518		lock.readLock().lock();
#	Line 383 | Line 524 | public class ReentrantReadWriteLockTest
524		lock.readLock().unlock();
525		}});
526
527	+	waitForQueuedThread(lock, t1);
528	+	waitForQueuedThread(lock, t2);
529	+	assertWriteLockedBy(lock, Thread.currentThread());
530		lock.readLock().lock();
531		lock.readLock().unlock();
532	<	Thread.sleep(SHORT_DELAY_MS);
533	<	lock.readLock().lock();
534	<	lock.readLock().unlock();
391	<	lock.writeLock().unlock();
392	<	t1.join(MEDIUM_DELAY_MS);
393	<	t2.join(MEDIUM_DELAY_MS);
394	<	assertTrue(!t1.isAlive());
395	<	assertTrue(!t2.isAlive());
532	>	releaseWriteLock(lock);
533	>	awaitTermination(t1);
534	>	awaitTermination(t2);
535		}
536
537		/**
#	Line 400 | Line 539 | public class ReentrantReadWriteLockTest
539		* other threads are waiting for writelock
540		*/
541		public void testReadHoldingWriteLock3() throws InterruptedException {
542	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
542	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
543		lock.writeLock().lock();
544	+	lock.readLock().lock();
545	+	lock.readLock().unlock();
546	+
547		Thread t1 = newStartedThread(new CheckedRunnable() {
548		public void realRun() {
549		lock.writeLock().lock();
#	Line 413 | Line 555 | public class ReentrantReadWriteLockTest
555		lock.writeLock().unlock();
556		}});
557
558	+	waitForQueuedThread(lock, t1);
559	+	waitForQueuedThread(lock, t2);
560	+	assertWriteLockedBy(lock, Thread.currentThread());
561		lock.readLock().lock();
562		lock.readLock().unlock();
563	<	Thread.sleep(SHORT_DELAY_MS);
564	<	lock.readLock().lock();
565	<	lock.readLock().unlock();
421	<	lock.writeLock().unlock();
422	<	t1.join(MEDIUM_DELAY_MS);
423	<	t2.join(MEDIUM_DELAY_MS);
424	<	assertTrue(!t1.isAlive());
425	<	assertTrue(!t2.isAlive());
563	>	releaseWriteLock(lock);
564	>	awaitTermination(t1);
565	>	awaitTermination(t2);
566		}
567
428	–
568		/**
569		* Write lock succeeds if write locked by current thread even if
570		* other threads are waiting for writelock
571		*/
572		public void testWriteHoldingWriteLock4() throws InterruptedException {
573	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
573	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
574	>	lock.writeLock().lock();
575		lock.writeLock().lock();
576	+	lock.writeLock().unlock();
577	+
578		Thread t1 = newStartedThread(new CheckedRunnable() {
579		public void realRun() {
580		lock.writeLock().lock();
#	Line 444 | Line 586 | public class ReentrantReadWriteLockTest
586		lock.writeLock().unlock();
587		}});
588
589	+	waitForQueuedThread(lock, t1);
590	+	waitForQueuedThread(lock, t2);
591	+	assertWriteLockedBy(lock, Thread.currentThread());
592	+	assertEquals(1, lock.getWriteHoldCount());
593		lock.writeLock().lock();
594	+	assertWriteLockedBy(lock, Thread.currentThread());
595	+	assertEquals(2, lock.getWriteHoldCount());
596		lock.writeLock().unlock();
597	<	Thread.sleep(SHORT_DELAY_MS);
598	<	lock.writeLock().lock();
599	<	lock.writeLock().unlock();
452	<	lock.writeLock().unlock();
453	<	t1.join(MEDIUM_DELAY_MS);
454	<	t2.join(MEDIUM_DELAY_MS);
455	<	assertTrue(!t1.isAlive());
456	<	assertTrue(!t2.isAlive());
597	>	releaseWriteLock(lock);
598	>	awaitTermination(t1);
599	>	awaitTermination(t2);
600		}
601
459	–
602		/**
603		* Fair Read trylock succeeds if write locked by current thread
604		*/
#	Line 473 | Line 615 | public class ReentrantReadWriteLockTest
615		* other threads are waiting for readlock
616		*/
617		public void testReadHoldingWriteLockFair2() throws InterruptedException {
618	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
618	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
619		lock.writeLock().lock();
620	+	lock.readLock().lock();
621	+	lock.readLock().unlock();
622	+
623		Thread t1 = newStartedThread(new CheckedRunnable() {
624		public void realRun() {
625		lock.readLock().lock();
#	Line 486 | Line 631 | public class ReentrantReadWriteLockTest
631		lock.readLock().unlock();
632		}});
633
634	+	waitForQueuedThread(lock, t1);
635	+	waitForQueuedThread(lock, t2);
636	+	assertWriteLockedBy(lock, Thread.currentThread());
637		lock.readLock().lock();
638		lock.readLock().unlock();
639	<	Thread.sleep(SHORT_DELAY_MS);
640	<	lock.readLock().lock();
641	<	lock.readLock().unlock();
494	<	lock.writeLock().unlock();
495	<	t1.join(MEDIUM_DELAY_MS);
496	<	t2.join(MEDIUM_DELAY_MS);
497	<	assertTrue(!t1.isAlive());
498	<	assertTrue(!t2.isAlive());
639	>	releaseWriteLock(lock);
640	>	awaitTermination(t1);
641	>	awaitTermination(t2);
642		}
643
501	–
644		/**
645		* Fair Read lock succeeds if write locked by current thread even if
646		* other threads are waiting for writelock
647		*/
648		public void testReadHoldingWriteLockFair3() throws InterruptedException {
649	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
649	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
650		lock.writeLock().lock();
651	+	lock.readLock().lock();
652	+	lock.readLock().unlock();
653	+
654		Thread t1 = newStartedThread(new CheckedRunnable() {
655		public void realRun() {
656		lock.writeLock().lock();
#	Line 517 | Line 662 | public class ReentrantReadWriteLockTest
662		lock.writeLock().unlock();
663		}});
664
665	+	waitForQueuedThread(lock, t1);
666	+	waitForQueuedThread(lock, t2);
667	+	assertWriteLockedBy(lock, Thread.currentThread());
668		lock.readLock().lock();
669		lock.readLock().unlock();
670	<	Thread.sleep(SHORT_DELAY_MS);
671	<	lock.readLock().lock();
672	<	lock.readLock().unlock();
525	<	lock.writeLock().unlock();
526	<	t1.join(MEDIUM_DELAY_MS);
527	<	t2.join(MEDIUM_DELAY_MS);
528	<	assertTrue(!t1.isAlive());
529	<	assertTrue(!t2.isAlive());
670	>	releaseWriteLock(lock);
671	>	awaitTermination(t1);
672	>	awaitTermination(t2);
673		}
674
532	–
675		/**
676		* Fair Write lock succeeds if write locked by current thread even if
677		* other threads are waiting for writelock
678		*/
679		public void testWriteHoldingWriteLockFair4() throws InterruptedException {
680	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
680	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(true);
681		lock.writeLock().lock();
682		Thread t1 = newStartedThread(new CheckedRunnable() {
683		public void realRun() {
#	Line 548 | Line 690 | public class ReentrantReadWriteLockTest
690		lock.writeLock().unlock();
691		}});
692
693	<	Thread.sleep(SHORT_DELAY_MS);
694	<	assertTrue(lock.isWriteLockedByCurrentThread());
693	>	waitForQueuedThread(lock, t1);
694	>	waitForQueuedThread(lock, t2);
695	>	assertWriteLockedBy(lock, Thread.currentThread());
696		assertEquals(1, lock.getWriteHoldCount());
697		lock.writeLock().lock();
698		assertEquals(2, lock.getWriteHoldCount());
699		lock.writeLock().unlock();
700		lock.writeLock().lock();
701		lock.writeLock().unlock();
702	<	lock.writeLock().unlock();
703	<	t1.join(MEDIUM_DELAY_MS);
704	<	t2.join(MEDIUM_DELAY_MS);
562	<	assertTrue(!t1.isAlive());
563	<	assertTrue(!t2.isAlive());
702	>	releaseWriteLock(lock);
703	>	awaitTermination(t1);
704	>	awaitTermination(t2);
705		}
706
566	–
707		/**
708		* Read tryLock succeeds if readlocked but not writelocked
709		*/
#	Line 576 | Line 716 | public class ReentrantReadWriteLockTest
716		lock.readLock().unlock();
717		}});
718
719	<	t.join();
719	>	awaitTermination(t);
720		lock.readLock().unlock();
721		}
722
#	Line 591 | Line 731 | public class ReentrantReadWriteLockTest
731		assertFalse(lock.writeLock().tryLock());
732		}});
733
734	<	t.join();
734	>	awaitTermination(t);
735		lock.readLock().unlock();
736		}
737
598	–
738		/**
739		* Fair Read tryLock succeeds if readlocked but not writelocked
740		*/
#	Line 608 | Line 747 | public class ReentrantReadWriteLockTest
747		lock.readLock().unlock();
748		}});
749
750	<	t.join();
750	>	awaitTermination(t);
751		lock.readLock().unlock();
752		}
753
615	–
616	–
754		/**
755		* Fair write tryLock fails when readlocked
756		*/
#	Line 625 | Line 762 | public class ReentrantReadWriteLockTest
762		assertFalse(lock.writeLock().tryLock());
763		}});
764
765	<	t.join();
765	>	awaitTermination(t);
766		lock.readLock().unlock();
767		}
768
632	–
633	–
769		/**
770		* write timed tryLock times out if locked
771		*/
#	Line 642 | Line 777 | public class ReentrantReadWriteLockTest
777		assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
778		}});
779
780	<	t.join();
780	>	awaitTermination(t);
781		assertTrue(lock.writeLock().isHeldByCurrentThread());
782		lock.writeLock().unlock();
783		}
#	Line 658 | Line 793 | public class ReentrantReadWriteLockTest
793		assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
794		}});
795
796	<	t.join();
796	>	awaitTermination(t);
797		assertTrue(lock.writeLock().isHeldByCurrentThread());
798		lock.writeLock().unlock();
799		}
800
666	–
801		/**
802		* write lockInterruptibly succeeds if lock free else is interruptible
803		*/
804		public void testWriteLockInterruptibly() throws InterruptedException {
805	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
805	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
806		lock.writeLock().lockInterruptibly();
807		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
808		public void realRun() throws InterruptedException {
809		lock.writeLock().lockInterruptibly();
810		}});
811
812	<	Thread.sleep(SHORT_DELAY_MS);
812	>	waitForQueuedThread(lock, t);
813		t.interrupt();
814	<	Thread.sleep(SHORT_DELAY_MS);
815	<	t.join();
682	<	lock.writeLock().unlock();
814	>	awaitTermination(t);
815	>	releaseWriteLock(lock);
816		}
817
818		/**
819		* read lockInterruptibly succeeds if lock free else is interruptible
820		*/
821		public void testReadLockInterruptibly() throws InterruptedException {
822	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
822	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
823		lock.writeLock().lockInterruptibly();
824		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
825		public void realRun() throws InterruptedException {
826		lock.readLock().lockInterruptibly();
827		}});
828
829	<	Thread.sleep(SHORT_DELAY_MS);
829	>	waitForQueuedThread(lock, t);
830		t.interrupt();
831	<	t.join();
832	<	lock.writeLock().unlock();
831	>	awaitTermination(t);
832	>	releaseWriteLock(lock);
833		}
834
835		/**
#	Line 709 | Line 842 | public class ReentrantReadWriteLockTest
842		c.await();
843		shouldThrow();
844		} catch (IllegalMonitorStateException success) {}
845	+	try {
846	+	c.await(LONG_DELAY_MS, MILLISECONDS);
847	+	shouldThrow();
848	+	} catch (IllegalMonitorStateException success) {}
849	+	try {
850	+	c.awaitNanos(100);
851	+	shouldThrow();
852	+	} catch (IllegalMonitorStateException success) {}
853	+	try {
854	+	c.awaitUninterruptibly();
855	+	shouldThrow();
856	+	} catch (IllegalMonitorStateException success) {}
857		}
858
859		/**
#	Line 724 | Line 869 | public class ReentrantReadWriteLockTest
869		}
870
871		/**
872	+	* Calling signalAll without holding lock throws IllegalMonitorStateException
873	+	*/
874	+	public void testSignalAll_IllegalMonitor() {
875	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
876	+	final Condition c = lock.writeLock().newCondition();
877	+	try {
878	+	c.signalAll();
879	+	shouldThrow();
880	+	} catch (IllegalMonitorStateException success) {}
881	+	}
882	+
883	+	/**
884		* awaitNanos without a signal times out
885		*/
886		public void testAwaitNanos_Timeout() throws InterruptedException {
887		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
888		final Condition c = lock.writeLock().newCondition();
732	–
889		lock.writeLock().lock();
890	<	long t = c.awaitNanos(100);
891	<	assertTrue(t <= 0);
890	>	long startTime = System.nanoTime();
891	>	long timeoutMillis = 10;
892	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
893	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
894	>	assertTrue(nanosRemaining <= 0);
895	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
896		lock.writeLock().unlock();
897		}
898
739	–
899		/**
900		* timed await without a signal times out
901		*/
#	Line 744 | Line 903 | public class ReentrantReadWriteLockTest
903		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
904		final Condition c = lock.writeLock().newCondition();
905		lock.writeLock().lock();
906	<	assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
906	>	long startTime = System.nanoTime();
907	>	long timeoutMillis = 10;
908	>	assertFalse(c.await(timeoutMillis, MILLISECONDS));
909	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
910		lock.writeLock().unlock();
911		}
912
#	Line 766 | Line 928 | public class ReentrantReadWriteLockTest
928		public void testAwait() throws InterruptedException {
929		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
930		final Condition c = lock.writeLock().newCondition();
931	+	final CountDownLatch locked = new CountDownLatch(1);
932		Thread t = newStartedThread(new CheckedRunnable() {
933		public void realRun() throws InterruptedException {
934		lock.writeLock().lock();
935	+	locked.countDown();
936		c.await();
937		lock.writeLock().unlock();
938		}});
939
940	<	Thread.sleep(SHORT_DELAY_MS);
940	>	locked.await();
941		lock.writeLock().lock();
942		c.signal();
943	+	assertTrue(t.isAlive());
944		lock.writeLock().unlock();
945	<	t.join(SHORT_DELAY_MS);
781	<	assertFalse(t.isAlive());
782	<	}
783	<
784	<	/** A helper class for uninterruptible wait tests */
785	<	class UninterruptableThread extends Thread {
786	<	private Lock lock;
787	<	private Condition c;
788	<
789	<	public volatile boolean canAwake = false;
790	<	public volatile boolean interrupted = false;
791	<	public volatile boolean lockStarted = false;
792	<
793	<	public UninterruptableThread(Lock lock, Condition c) {
794	<	this.lock = lock;
795	<	this.c = c;
796	<	}
797	<
798	<	public synchronized void run() {
799	<	lock.lock();
800	<	lockStarted = true;
801	<
802	<	while (!canAwake) {
803	<	c.awaitUninterruptibly();
804	<	}
805	<
806	<	interrupted = isInterrupted();
807	<	lock.unlock();
808	<	}
945	>	awaitTermination(t);
946		}
947
948		/**
#	Line 814 | Line 951 | public class ReentrantReadWriteLockTest
951		public void testAwaitUninterruptibly() throws InterruptedException {
952		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
953		final Condition c = lock.writeLock().newCondition();
954	<	UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
955	<
956	<	thread.start();
957	<
958	<	while (!thread.lockStarted) {
959	<	Thread.sleep(100);
960	<	}
954	>	final CountDownLatch locked = new CountDownLatch(1);
955	>	final AtomicBoolean canAwake = new AtomicBoolean(false);
956	>	Thread t = newStartedThread(new CheckedRunnable() {
957	>	public void realRun() {
958	>	lock.writeLock().lock();
959	>	locked.countDown();
960	>	c.awaitUninterruptibly();
961	>	assertTrue(Thread.interrupted());
962	>	lock.writeLock().unlock();
963	>	}});
964
965	+	locked.await();
966		lock.writeLock().lock();
967	<	try {
968	<	thread.interrupt();
969	<	thread.canAwake = true;
970	<	c.signal();
971	<	} finally {
972	<	lock.writeLock().unlock();
973	<	}
974	<
834	<	thread.join();
835	<	assertTrue(thread.interrupted);
836	<	assertFalse(thread.isAlive());
967	>	lock.writeLock().unlock();
968	>	t.interrupt();
969	>	t.join(10);
970	>	assertTrue(t.isAlive());
971	>	lock.writeLock().lock();
972	>	c.signal();
973	>	lock.writeLock().unlock();
974	>	awaitTermination(t);
975		}
976
977		/**
978		* await is interruptible
979		*/
980		public void testAwait_Interrupt() throws InterruptedException {
981	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
981	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
982		final Condition c = lock.writeLock().newCondition();
983	+	final CountDownLatch locked = new CountDownLatch(1);
984		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
985		public void realRun() throws InterruptedException {
986		lock.writeLock().lock();
987	<	c.await();
988	<	lock.writeLock().unlock();
987	>	assertWriteLockedBy(lock, Thread.currentThread());
988	>	assertHasNoWaiters(lock, c);
989	>	locked.countDown();
990	>	try {
991	>	c.await();
992	>	} finally {
993	>	assertWriteLockedBy(lock, Thread.currentThread());
994	>	assertHasNoWaiters(lock, c);
995	>	lock.writeLock().unlock();
996	>	assertFalse(Thread.interrupted());
997	>	}
998		}});
999
1000	<	Thread.sleep(SHORT_DELAY_MS);
1000	>	locked.await();
1001	>	assertHasWaiters(lock, c, t);
1002		t.interrupt();
1003	<	t.join(SHORT_DELAY_MS);
1004	<	assertFalse(t.isAlive());
1003	>	awaitTermination(t);
1004	>	assertNotWriteLocked(lock);
1005		}
1006
1007		/**
1008		* awaitNanos is interruptible
1009		*/
1010		public void testAwaitNanos_Interrupt() throws InterruptedException {
1011	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1011	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1012		final Condition c = lock.writeLock().newCondition();
1013	+	final CountDownLatch locked = new CountDownLatch(1);
1014		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1015		public void realRun() throws InterruptedException {
1016		lock.writeLock().lock();
1017	<	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
1018	<	lock.writeLock().unlock();
1017	>	assertWriteLockedBy(lock, Thread.currentThread());
1018	>	assertHasNoWaiters(lock, c);
1019	>	locked.countDown();
1020	>	try {
1021	>	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
1022	>	} finally {
1023	>	assertWriteLockedBy(lock, Thread.currentThread());
1024	>	assertHasNoWaiters(lock, c);
1025	>	lock.writeLock().unlock();
1026	>	assertFalse(Thread.interrupted());
1027	>	}
1028		}});
1029
1030	<	Thread.sleep(SHORT_DELAY_MS);
1030	>	locked.await();
1031	>	assertHasWaiters(lock, c, t);
1032		t.interrupt();
1033	<	t.join(SHORT_DELAY_MS);
1034	<	assertFalse(t.isAlive());
1033	>	awaitTermination(t);
1034	>	assertNotWriteLocked(lock);
1035		}
1036
1037		/**
1038		* awaitUntil is interruptible
1039		*/
1040		public void testAwaitUntil_Interrupt() throws InterruptedException {
1041	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1041	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1042		final Condition c = lock.writeLock().newCondition();
1043	+	final CountDownLatch locked = new CountDownLatch(1);
1044		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1045		public void realRun() throws InterruptedException {
1046		lock.writeLock().lock();
1047	+	assertWriteLockedBy(lock, Thread.currentThread());
1048	+	assertHasNoWaiters(lock, c);
1049	+	locked.countDown();
1050		java.util.Date d = new java.util.Date();
1051	<	c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1052	<	lock.writeLock().unlock();
1051	>	try {
1052	>	c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1053	>	} finally {
1054	>	assertWriteLockedBy(lock, Thread.currentThread());
1055	>	assertHasNoWaiters(lock, c);
1056	>	lock.writeLock().unlock();
1057	>	assertFalse(Thread.interrupted());
1058	>	}
1059		}});
1060
1061	<	Thread.sleep(SHORT_DELAY_MS);
1061	>	locked.await();
1062	>	assertHasWaiters(lock, c, t);
1063		t.interrupt();
1064	<	t.join(SHORT_DELAY_MS);
1065	<	assertFalse(t.isAlive());
1064	>	awaitTermination(t);
1065	>	assertNotWriteLocked(lock);
1066		}
1067
1068		/**
1069		* signalAll wakes up all threads
1070		*/
1071		public void testSignalAll() throws InterruptedException {
1072	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1072	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1073		final Condition c = lock.writeLock().newCondition();
1074	+	final CountDownLatch locked = new CountDownLatch(2);
1075	+	final Lock writeLock = lock.writeLock();
1076		Thread t1 = newStartedThread(new CheckedRunnable() {
1077		public void realRun() throws InterruptedException {
1078	<	lock.writeLock().lock();
1078	>	writeLock.lock();
1079	>	locked.countDown();
1080		c.await();
1081	<	lock.writeLock().unlock();
1081	>	writeLock.unlock();
1082		}});
1083
1084		Thread t2 = newStartedThread(new CheckedRunnable() {
1085		public void realRun() throws InterruptedException {
1086	<	lock.writeLock().lock();
1086	>	writeLock.lock();
1087	>	locked.countDown();
1088		c.await();
1089	<	lock.writeLock().unlock();
1089	>	writeLock.unlock();
1090		}});
1091
1092	<	Thread.sleep(SHORT_DELAY_MS);
1093	<	lock.writeLock().lock();
1092	>	locked.await();
1093	>	writeLock.lock();
1094	>	assertHasWaiters(lock, c, t1, t2);
1095		c.signalAll();
1096	<	lock.writeLock().unlock();
1097	<	t1.join(SHORT_DELAY_MS);
1098	<	t2.join(SHORT_DELAY_MS);
1099	<	assertFalse(t1.isAlive());
1100	<	assertFalse(t2.isAlive());
1096	>	assertHasNoWaiters(lock, c);
1097	>	writeLock.unlock();
1098	>	awaitTermination(t1);
1099	>	awaitTermination(t2);
1100	>	}
1101	>
1102	>	/**
1103	>	* signal wakes up waiting threads in FIFO order.
1104	>	*/
1105	>	public void testSignalWakesFifo() throws InterruptedException {
1106	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1107	>	final Condition c = lock.writeLock().newCondition();
1108	>	final CountDownLatch locked1 = new CountDownLatch(1);
1109	>	final CountDownLatch locked2 = new CountDownLatch(1);
1110	>	final Lock writeLock = lock.writeLock();
1111	>	Thread t1 = newStartedThread(new CheckedRunnable() {
1112	>	public void realRun() throws InterruptedException {
1113	>	writeLock.lock();
1114	>	locked1.countDown();
1115	>	c.await();
1116	>	writeLock.unlock();
1117	>	}});
1118	>
1119	>	locked1.await();
1120	>
1121	>	Thread t2 = newStartedThread(new CheckedRunnable() {
1122	>	public void realRun() throws InterruptedException {
1123	>	writeLock.lock();
1124	>	locked2.countDown();
1125	>	c.await();
1126	>	writeLock.unlock();
1127	>	}});
1128	>
1129	>	locked2.await();
1130	>
1131	>	writeLock.lock();
1132	>	assertHasWaiters(lock, c, t1, t2);
1133	>	assertFalse(lock.hasQueuedThreads());
1134	>	c.signal();
1135	>	assertHasWaiters(lock, c, t2);
1136	>	assertTrue(lock.hasQueuedThread(t1));
1137	>	assertFalse(lock.hasQueuedThread(t2));
1138	>	c.signal();
1139	>	assertHasNoWaiters(lock, c);
1140	>	assertTrue(lock.hasQueuedThread(t1));
1141	>	assertTrue(lock.hasQueuedThread(t2));
1142	>	writeLock.unlock();
1143	>	awaitTermination(t1);
1144	>	awaitTermination(t2);
1145		}
1146
1147		/**
#	Line 948 | Line 1168 | public class ReentrantReadWriteLockTest
1168		* hasQueuedThreads reports whether there are waiting threads
1169		*/
1170		public void testhasQueuedThreads() throws InterruptedException {
1171	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1171	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1172		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1173		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1174		assertFalse(lock.hasQueuedThreads());
1175		lock.writeLock().lock();
1176	+	assertFalse(lock.hasQueuedThreads());
1177	+	long startTime = System.nanoTime();
1178		t1.start();
1179	<	Thread.sleep(SHORT_DELAY_MS);
958	<	assertTrue(lock.hasQueuedThreads());
1179	>	waitForQueuedThread(lock, t1);
1180		t2.start();
1181	<	Thread.sleep(SHORT_DELAY_MS);
1181	>	waitForQueuedThread(lock, t2);
1182		assertTrue(lock.hasQueuedThreads());
1183		t1.interrupt();
1184	<	Thread.sleep(SHORT_DELAY_MS);
1184	>	awaitTermination(t1);
1185		assertTrue(lock.hasQueuedThreads());
1186		lock.writeLock().unlock();
1187	<	Thread.sleep(SHORT_DELAY_MS);
1187	>	awaitTermination(t2);
1188		assertFalse(lock.hasQueuedThreads());
968	–	t1.join();
969	–	t2.join();
1189		}
1190
1191		/**
#	Line 984 | Line 1203 | public class ReentrantReadWriteLockTest
1203		* hasQueuedThread reports whether a thread is queued.
1204		*/
1205		public void testHasQueuedThread() throws InterruptedException {
1206	<	final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1207	<	Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1208	<	Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1209	<	assertFalse(sync.hasQueuedThread(t1));
1210	<	assertFalse(sync.hasQueuedThread(t2));
1211	<	sync.writeLock().lock();
1206	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1207	>	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1208	>	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1209	>	assertFalse(lock.hasQueuedThread(t1));
1210	>	assertFalse(lock.hasQueuedThread(t2));
1211	>	lock.writeLock().lock();
1212	>	long startTime = System.nanoTime();
1213		t1.start();
1214	<	Thread.sleep(SHORT_DELAY_MS);
1215	<	assertTrue(sync.hasQueuedThread(t1));
1214	>	waitForQueuedThread(lock, t1);
1215	>	assertTrue(lock.hasQueuedThread(t1));
1216	>	assertFalse(lock.hasQueuedThread(t2));
1217		t2.start();
1218	<	Thread.sleep(SHORT_DELAY_MS);
1219	<	assertTrue(sync.hasQueuedThread(t1));
1220	<	assertTrue(sync.hasQueuedThread(t2));
1218	>	waitForQueuedThread(lock, t2);
1219	>	assertTrue(lock.hasQueuedThread(t1));
1220	>	assertTrue(lock.hasQueuedThread(t2));
1221		t1.interrupt();
1222	<	Thread.sleep(SHORT_DELAY_MS);
1223	<	assertFalse(sync.hasQueuedThread(t1));
1224	<	assertTrue(sync.hasQueuedThread(t2));
1225	<	sync.writeLock().unlock();
1226	<	Thread.sleep(SHORT_DELAY_MS);
1227	<	assertFalse(sync.hasQueuedThread(t1));
1228	<	Thread.sleep(SHORT_DELAY_MS);
1008	<	assertFalse(sync.hasQueuedThread(t2));
1009	<	t1.join();
1010	<	t2.join();
1222	>	awaitTermination(t1);
1223	>	assertFalse(lock.hasQueuedThread(t1));
1224	>	assertTrue(lock.hasQueuedThread(t2));
1225	>	lock.writeLock().unlock();
1226	>	awaitTermination(t2);
1227	>	assertFalse(lock.hasQueuedThread(t1));
1228	>	assertFalse(lock.hasQueuedThread(t2));
1229		}
1230
1013	–
1231		/**
1232		* getQueueLength reports number of waiting threads
1233		*/
1234		public void testGetQueueLength() throws InterruptedException {
1235	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1235	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1236		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1237		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1238		assertEquals(0, lock.getQueueLength());
1239		lock.writeLock().lock();
1240	+	long startTime = System.nanoTime();
1241		t1.start();
1242	<	Thread.sleep(SHORT_DELAY_MS);
1242	>	waitForQueuedThread(lock, t1);
1243		assertEquals(1, lock.getQueueLength());
1244		t2.start();
1245	<	Thread.sleep(SHORT_DELAY_MS);
1245	>	waitForQueuedThread(lock, t2);
1246		assertEquals(2, lock.getQueueLength());
1247		t1.interrupt();
1248	<	Thread.sleep(SHORT_DELAY_MS);
1248	>	awaitTermination(t1);
1249		assertEquals(1, lock.getQueueLength());
1250		lock.writeLock().unlock();
1251	<	Thread.sleep(SHORT_DELAY_MS);
1251	>	awaitTermination(t2);
1252		assertEquals(0, lock.getQueueLength());
1035	–	t1.join();
1036	–	t2.join();
1253		}
1254
1255		/**
#	Line 1045 | Line 1261 | public class ReentrantReadWriteLockTest
1261		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1262		assertTrue(lock.getQueuedThreads().isEmpty());
1263		lock.writeLock().lock();
1264	+	long startTime = System.nanoTime();
1265		assertTrue(lock.getQueuedThreads().isEmpty());
1266		t1.start();
1267	<	Thread.sleep(SHORT_DELAY_MS);
1267	>	waitForQueuedThread(lock, t1);
1268	>	assertEquals(1, lock.getQueuedThreads().size());
1269		assertTrue(lock.getQueuedThreads().contains(t1));
1270		t2.start();
1271	<	Thread.sleep(SHORT_DELAY_MS);
1271	>	waitForQueuedThread(lock, t2);
1272	>	assertEquals(2, lock.getQueuedThreads().size());
1273		assertTrue(lock.getQueuedThreads().contains(t1));
1274		assertTrue(lock.getQueuedThreads().contains(t2));
1275		t1.interrupt();
1276	<	Thread.sleep(SHORT_DELAY_MS);
1276	>	awaitTermination(t1);
1277		assertFalse(lock.getQueuedThreads().contains(t1));
1278		assertTrue(lock.getQueuedThreads().contains(t2));
1279	+	assertEquals(1, lock.getQueuedThreads().size());
1280		lock.writeLock().unlock();
1281	<	Thread.sleep(SHORT_DELAY_MS);
1281	>	awaitTermination(t2);
1282		assertTrue(lock.getQueuedThreads().isEmpty());
1063	–	t1.join();
1064	–	t2.join();
1283		}
1284
1285		/**
#	Line 1086 | Line 1304 | public class ReentrantReadWriteLockTest
1304		} catch (NullPointerException success) {}
1305		}
1306
1089	–
1307		/**
1308		* getWaitingThreads throws NPE if null
1309		*/
#	Line 1123 | Line 1340 | public class ReentrantReadWriteLockTest
1340		} catch (IllegalMonitorStateException success) {}
1341		}
1342
1126	–
1343		/**
1344		* getWaitQueueLength throws IAE if not owned
1345		*/
#	Line 1149 | Line 1365 | public class ReentrantReadWriteLockTest
1365		} catch (IllegalMonitorStateException success) {}
1366		}
1367
1152	–
1368		/**
1369		* getWaitingThreads throws IAE if not owned
1370		*/
#	Line 1175 | Line 1390 | public class ReentrantReadWriteLockTest
1390		} catch (IllegalMonitorStateException success) {}
1391		}
1392
1178	–
1393		/**
1394		* hasWaiters returns true when a thread is waiting, else false
1395		*/
1396		public void testHasWaiters() throws InterruptedException {
1397	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1397	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1398		final Condition c = lock.writeLock().newCondition();
1399	+	final CountDownLatch locked = new CountDownLatch(1);
1400		Thread t = newStartedThread(new CheckedRunnable() {
1401		public void realRun() throws InterruptedException {
1402		lock.writeLock().lock();
1403		assertFalse(lock.hasWaiters(c));
1404	+	locked.countDown();
1405		assertEquals(0, lock.getWaitQueueLength(c));
1406		c.await();
1407		lock.writeLock().unlock();
1408		}});
1409
1410	<	Thread.sleep(SHORT_DELAY_MS);
1410	>	locked.await();
1411		lock.writeLock().lock();
1412		assertTrue(lock.hasWaiters(c));
1413		assertEquals(1, lock.getWaitQueueLength(c));
1414		c.signal();
1415	+	assertHasNoWaiters(lock, c);
1416		lock.writeLock().unlock();
1417	<	Thread.sleep(SHORT_DELAY_MS);
1418	<	lock.writeLock().lock();
1202	<	assertFalse(lock.hasWaiters(c));
1203	<	assertEquals(0, lock.getWaitQueueLength(c));
1204	<	lock.writeLock().unlock();
1205	<	t.join(SHORT_DELAY_MS);
1206	<	assertFalse(t.isAlive());
1417	>	awaitTermination(t);
1418	>	assertHasNoWaiters(lock, c);
1419		}
1420
1421		/**
1422		* getWaitQueueLength returns number of waiting threads
1423		*/
1424		public void testGetWaitQueueLength() throws InterruptedException {
1425	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1425	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1426		final Condition c = lock.writeLock().newCondition();
1427	+	final CountDownLatch locked = new CountDownLatch(1);
1428		Thread t = newStartedThread(new CheckedRunnable() {
1429		public void realRun() throws InterruptedException {
1430		lock.writeLock().lock();
1218	–	assertFalse(lock.hasWaiters(c));
1431		assertEquals(0, lock.getWaitQueueLength(c));
1432	+	locked.countDown();
1433		c.await();
1434		lock.writeLock().unlock();
1435		}});
1436
1437	<	Thread.sleep(SHORT_DELAY_MS);
1437	>	locked.await();
1438		lock.writeLock().lock();
1439	<	assertTrue(lock.hasWaiters(c));
1439	>	assertHasWaiters(lock, c, t);
1440		assertEquals(1, lock.getWaitQueueLength(c));
1441		c.signal();
1442	<	lock.writeLock().unlock();
1230	<	Thread.sleep(SHORT_DELAY_MS);
1231	<	lock.writeLock().lock();
1232	<	assertFalse(lock.hasWaiters(c));
1442	>	assertHasNoWaiters(lock, c);
1443		assertEquals(0, lock.getWaitQueueLength(c));
1444		lock.writeLock().unlock();
1445	<	t.join(SHORT_DELAY_MS);
1236	<	assertFalse(t.isAlive());
1445	>	awaitTermination(t);
1446		}
1447
1239	–
1448		/**
1449		* getWaitingThreads returns only and all waiting threads
1450		*/
1451		public void testGetWaitingThreads() throws InterruptedException {
1452		final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1453		final Condition c = lock.writeLock().newCondition();
1454	+	final CountDownLatch locked1 = new CountDownLatch(1);
1455	+	final CountDownLatch locked2 = new CountDownLatch(1);
1456		Thread t1 = new Thread(new CheckedRunnable() {
1457		public void realRun() throws InterruptedException {
1458		lock.writeLock().lock();
1459		assertTrue(lock.getWaitingThreads(c).isEmpty());
1460	+	locked1.countDown();
1461		c.await();
1462		lock.writeLock().unlock();
1463		}});
#	Line 1255 | Line 1466 | public class ReentrantReadWriteLockTest
1466		public void realRun() throws InterruptedException {
1467		lock.writeLock().lock();
1468		assertFalse(lock.getWaitingThreads(c).isEmpty());
1469	+	locked2.countDown();
1470		c.await();
1471		lock.writeLock().unlock();
1472		}});
#	Line 1262 | Line 1474 | public class ReentrantReadWriteLockTest
1474		lock.writeLock().lock();
1475		assertTrue(lock.getWaitingThreads(c).isEmpty());
1476		lock.writeLock().unlock();
1477	+
1478		t1.start();
1479	<	Thread.sleep(SHORT_DELAY_MS);
1479	>	locked1.await();
1480		t2.start();
1481	<	Thread.sleep(SHORT_DELAY_MS);
1481	>	locked2.await();
1482	>
1483		lock.writeLock().lock();
1484		assertTrue(lock.hasWaiters(c));
1485		assertTrue(lock.getWaitingThreads(c).contains(t1));
1486		assertTrue(lock.getWaitingThreads(c).contains(t2));
1487	+	assertEquals(2, lock.getWaitingThreads(c).size());
1488		c.signalAll();
1489	+	assertHasNoWaiters(lock, c);
1490		lock.writeLock().unlock();
1491	<	Thread.sleep(SHORT_DELAY_MS);
1492	<	lock.writeLock().lock();
1493	<	assertFalse(lock.hasWaiters(c));
1494	<	assertTrue(lock.getWaitingThreads(c).isEmpty());
1495	<	lock.writeLock().unlock();
1280	<	t1.join(SHORT_DELAY_MS);
1281	<	t2.join(SHORT_DELAY_MS);
1282	<	assertFalse(t1.isAlive());
1283	<	assertFalse(t2.isAlive());
1491	>
1492	>	awaitTermination(t1);
1493	>	awaitTermination(t2);
1494	>
1495	>	assertHasNoWaiters(lock, c);
1496		}
1497
1498		/**

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines