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.55 by jsr166, Mon May 2 01:15:26 2011 UTC vs.
Revision 1.56 by jsr166, Tue May 3 06:08:49 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 69 | Line 69 | public class ReentrantReadWriteLockTest
69		}
70
71		/**
72	+	* Spin-waits until lock.hasQueuedThread(t) becomes true.
73	+	*/
74	+	void waitForQueuedThread(ReentrantReadWriteLock lock, Thread t) {
75	+	long startTime = System.nanoTime();
76	+	while (!lock.hasQueuedThread(t)) {
77	+	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
78	+	throw new AssertionError("timed out");
79	+	Thread.yield();
80	+	}
81	+	}
82	+
83	+	/**
84	+	* Checks that lock is not write-locked.
85	+	*/
86	+	void assertNotWriteLocked(ReentrantReadWriteLock lock) {
87	+	assertFalse(lock.isWriteLocked());
88	+	assertFalse(lock.isWriteLockedByCurrentThread());
89	+	assertEquals(0, lock.getWriteHoldCount());
90	+	}
91	+
92	+	/**
93	+	* Checks that condition c has no waiters.
94	+	*/
95	+	void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) {
96	+	assertHasWaiters(lock, c, new Thread[] {});
97	+	}
98	+
99	+	/**
100	+	* Checks that condition c has exactly the given waiter threads.
101	+	*/
102	+	void assertHasWaiters(PublicReentrantReadWriteLock lock, Condition c,
103	+	Thread... threads) {
104	+	lock.writeLock().lock();
105	+	assertEquals(threads.length > 0, lock.hasWaiters(c));
106	+	assertEquals(threads.length, lock.getWaitQueueLength(c));
107	+	assertEquals(threads.length == 0, lock.getWaitingThreads(c).isEmpty());
108	+	assertEquals(threads.length, lock.getWaitingThreads(c).size());
109	+	assertEquals(new HashSet<Thread>(lock.getWaitingThreads(c)),
110	+	new HashSet<Thread>(Arrays.asList(threads)));
111	+	lock.writeLock().unlock();
112	+	}
113	+
114	+	/**
115		* Constructor sets given fairness, and is in unlocked state
116		*/
117		public void testConstructor() {
#	Line 111 | Line 154 | public class ReentrantReadWriteLockTest
154		assertEquals(0, rl.getReadLockCount());
155		}
156
114	–
157		/**
158		* locking an unlocked fair lock succeeds
159		*/
#	Line 182 | Line 224 | public class ReentrantReadWriteLockTest
224		}
225		}
226
185	–
227		/**
228		* write-unlocking an unlocked lock throws IllegalMonitorStateException
229		*/
230	<	public void testUnlock_IllegalMonitorStateException() {
230	>	public void testWriteUnlock_IllegalMonitorStateException() {
231		ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
232		try {
233		rl.writeLock().unlock();
#	Line 194 | Line 235 | public class ReentrantReadWriteLockTest
235		} catch (IllegalMonitorStateException success) {}
236		}
237
238	+	/**
239	+	* read-unlocking an unlocked lock throws IllegalMonitorStateException
240	+	*/
241	+	public void testReadUnlock_IllegalMonitorStateException() {
242	+	ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
243	+	try {
244	+	rl.readLock().unlock();
245	+	shouldThrow();
246	+	} catch (IllegalMonitorStateException success) {}
247	+	}
248
249		/**
250		* write-lockInterruptibly is interruptible
#	Line 206 | Line 257 | public class ReentrantReadWriteLockTest
257		lock.writeLock().lockInterruptibly();
258		}});
259
260	<	Thread.sleep(SHORT_DELAY_MS);
260	>	waitForQueuedThread(lock, t);
261		t.interrupt();
262	<	awaitTermination(t, LONG_DELAY_MS);
262	>	awaitTermination(t);
263		releaseWriteLock(lock);
264		}
265
#	Line 220 | Line 271 | public class ReentrantReadWriteLockTest
271		lock.writeLock().lock();
272		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
273		public void realRun() throws InterruptedException {
274	<	lock.writeLock().tryLock(SMALL_DELAY_MS, MILLISECONDS);
274	>	lock.writeLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
275		}});
276
277	<	Thread.sleep(SHORT_DELAY_MS);
277	>	waitForQueuedThread(lock, t);
278		t.interrupt();
279	<	awaitTermination(t, LONG_DELAY_MS);
279	>	awaitTermination(t);
280		releaseWriteLock(lock);
281		}
282
#	Line 240 | Line 291 | public class ReentrantReadWriteLockTest
291		lock.readLock().lockInterruptibly();
292		}});
293
294	<	Thread.sleep(SHORT_DELAY_MS);
294	>	waitForQueuedThread(lock, t);
295		t.interrupt();
296	<	awaitTermination(t, LONG_DELAY_MS);
296	>	awaitTermination(t);
297		releaseWriteLock(lock);
298		}
299
#	Line 257 | Line 308 | public class ReentrantReadWriteLockTest
308		lock.readLock().tryLock(LONG_DELAY_MS, MILLISECONDS);
309		}});
310
311	<	Thread.sleep(SHORT_DELAY_MS);
311	>	waitForQueuedThread(lock, t);
312		t.interrupt();
313	<	awaitTermination(t, LONG_DELAY_MS);
313	>	awaitTermination(t);
314		releaseWriteLock(lock);
315		}
316
266	–
317		/**
318		* write-tryLock fails if locked
319		*/
#	Line 275 | Line 325 | public class ReentrantReadWriteLockTest
325		assertFalse(lock.writeLock().tryLock());
326		}});
327
328	<	awaitTermination(t, LONG_DELAY_MS);
328	>	awaitTermination(t);
329		releaseWriteLock(lock);
330		}
331
#	Line 290 | Line 340 | public class ReentrantReadWriteLockTest
340		assertFalse(lock.readLock().tryLock());
341		}});
342
343	<	awaitTermination(t, LONG_DELAY_MS);
343	>	awaitTermination(t);
344		releaseWriteLock(lock);
345		}
346
#	Line 306 | Line 356 | public class ReentrantReadWriteLockTest
356		lock.readLock().unlock();
357		}});
358
359	<	awaitTermination(t, LONG_DELAY_MS);
359	>	awaitTermination(t);
360		lock.readLock().unlock();
361		}
362
363		/**
364	<	* A writelock succeeds after reading threads unlock
364	>	* A writelock succeeds only after reading threads unlock
365		*/
366		public void testWriteAfterMultipleReadLocks() throws InterruptedException {
367		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 327 | Line 377 | public class ReentrantReadWriteLockTest
377		lock.writeLock().unlock();
378		}});
379
380	<	Thread.sleep(SHORT_DELAY_MS);
380	>	awaitTermination(t1);
381	>	waitForQueuedThread(lock, t2);
382	>	assertNotWriteLocked(lock);
383		lock.readLock().unlock();
384	<	awaitTermination(t1, LONG_DELAY_MS);
333	<	awaitTermination(t2, LONG_DELAY_MS);
384	>	awaitTermination(t2);
385		}
386
387		/**
388	<	* Readlocks succeed after a writing thread unlocks
388	>	* Readlocks succeed only after a writing thread unlocks
389		*/
390		public void testReadAfterWriteLock() throws InterruptedException {
391		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
#	Line 350 | Line 401 | public class ReentrantReadWriteLockTest
401		lock.readLock().unlock();
402		}});
403
404	<	Thread.sleep(SHORT_DELAY_MS);
405	<	assertTrue(t1.isAlive());
355	<	assertTrue(t2.isAlive());
404	>	waitForQueuedThread(lock, t1);
405	>	waitForQueuedThread(lock, t2);
406		releaseWriteLock(lock);
407	<	awaitTermination(t1, LONG_DELAY_MS);
408	<	awaitTermination(t2, LONG_DELAY_MS);
407	>	awaitTermination(t1);
408	>	awaitTermination(t2);
409		}
410
411		/**
#	Line 376 | Line 426 | public class ReentrantReadWriteLockTest
426		public void testReadHoldingWriteLock2() throws InterruptedException {
427		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
428		lock.writeLock().lock();
429	+	lock.readLock().lock();
430	+	lock.readLock().unlock();
431	+
432		Thread t1 = newStartedThread(new CheckedRunnable() {
433		public void realRun() {
434		lock.readLock().lock();
#	Line 387 | Line 440 | public class ReentrantReadWriteLockTest
440		lock.readLock().unlock();
441		}});
442
443	+	waitForQueuedThread(lock, t1);
444	+	waitForQueuedThread(lock, t2);
445	+	assertTrue(lock.isWriteLockedByCurrentThread());
446		lock.readLock().lock();
447		lock.readLock().unlock();
448	<	Thread.sleep(SHORT_DELAY_MS);
449	<	lock.readLock().lock();
450	<	lock.readLock().unlock();
395	<	lock.writeLock().unlock();
396	<	awaitTermination(t1, LONG_DELAY_MS);
397	<	awaitTermination(t2, LONG_DELAY_MS);
448	>	releaseWriteLock(lock);
449	>	awaitTermination(t1);
450	>	awaitTermination(t2);
451		}
452
453		/**
#	Line 404 | Line 457 | public class ReentrantReadWriteLockTest
457		public void testReadHoldingWriteLock3() throws InterruptedException {
458		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
459		lock.writeLock().lock();
460	+	lock.readLock().lock();
461	+	lock.readLock().unlock();
462	+
463		Thread t1 = newStartedThread(new CheckedRunnable() {
464		public void realRun() {
465		lock.writeLock().lock();
#	Line 415 | Line 471 | public class ReentrantReadWriteLockTest
471		lock.writeLock().unlock();
472		}});
473
474	+	waitForQueuedThread(lock, t1);
475	+	waitForQueuedThread(lock, t2);
476	+	assertTrue(lock.isWriteLockedByCurrentThread());
477		lock.readLock().lock();
478		lock.readLock().unlock();
479	<	Thread.sleep(SHORT_DELAY_MS);
480	<	lock.readLock().lock();
481	<	lock.readLock().unlock();
423	<	lock.writeLock().unlock();
424	<	awaitTermination(t1, LONG_DELAY_MS);
425	<	awaitTermination(t2, LONG_DELAY_MS);
479	>	releaseWriteLock(lock);
480	>	awaitTermination(t1);
481	>	awaitTermination(t2);
482		}
483
428	–
484		/**
485		* Write lock succeeds if write locked by current thread even if
486		* other threads are waiting for writelock
#	Line 433 | Line 488 | public class ReentrantReadWriteLockTest
488		public void testWriteHoldingWriteLock4() throws InterruptedException {
489		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
490		lock.writeLock().lock();
491	+	lock.writeLock().lock();
492	+	lock.writeLock().unlock();
493	+
494		Thread t1 = newStartedThread(new CheckedRunnable() {
495		public void realRun() {
496		lock.writeLock().lock();
#	Line 444 | Line 502 | public class ReentrantReadWriteLockTest
502		lock.writeLock().unlock();
503		}});
504
505	+	waitForQueuedThread(lock, t1);
506	+	waitForQueuedThread(lock, t2);
507	+	assertTrue(lock.isWriteLockedByCurrentThread());
508	+	assertEquals(1, lock.getWriteHoldCount());
509		lock.writeLock().lock();
510	+	assertTrue(lock.isWriteLockedByCurrentThread());
511	+	assertEquals(2, lock.getWriteHoldCount());
512		lock.writeLock().unlock();
513	<	Thread.sleep(SHORT_DELAY_MS);
514	<	lock.writeLock().lock();
515	<	lock.writeLock().unlock();
452	<	lock.writeLock().unlock();
453	<	awaitTermination(t1, LONG_DELAY_MS);
454	<	awaitTermination(t2, LONG_DELAY_MS);
513	>	releaseWriteLock(lock);
514	>	awaitTermination(t1);
515	>	awaitTermination(t2);
516		}
517
457	–
518		/**
519		* Fair Read trylock succeeds if write locked by current thread
520		*/
#	Line 473 | Line 533 | public class ReentrantReadWriteLockTest
533		public void testReadHoldingWriteLockFair2() throws InterruptedException {
534		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
535		lock.writeLock().lock();
536	+	lock.readLock().lock();
537	+	lock.readLock().unlock();
538	+
539		Thread t1 = newStartedThread(new CheckedRunnable() {
540		public void realRun() {
541		lock.readLock().lock();
#	Line 484 | Line 547 | public class ReentrantReadWriteLockTest
547		lock.readLock().unlock();
548		}});
549
550	+	waitForQueuedThread(lock, t1);
551	+	waitForQueuedThread(lock, t2);
552	+	assertTrue(lock.isWriteLockedByCurrentThread());
553		lock.readLock().lock();
554		lock.readLock().unlock();
555	<	Thread.sleep(SHORT_DELAY_MS);
556	<	lock.readLock().lock();
557	<	lock.readLock().unlock();
492	<	lock.writeLock().unlock();
493	<	awaitTermination(t1, LONG_DELAY_MS);
494	<	awaitTermination(t2, LONG_DELAY_MS);
555	>	releaseWriteLock(lock);
556	>	awaitTermination(t1);
557	>	awaitTermination(t2);
558		}
559
497	–
560		/**
561		* Fair Read lock succeeds if write locked by current thread even if
562		* other threads are waiting for writelock
#	Line 502 | Line 564 | public class ReentrantReadWriteLockTest
564		public void testReadHoldingWriteLockFair3() throws InterruptedException {
565		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
566		lock.writeLock().lock();
567	+	lock.readLock().lock();
568	+	lock.readLock().unlock();
569	+
570		Thread t1 = newStartedThread(new CheckedRunnable() {
571		public void realRun() {
572		lock.writeLock().lock();
#	Line 513 | Line 578 | public class ReentrantReadWriteLockTest
578		lock.writeLock().unlock();
579		}});
580
581	+	waitForQueuedThread(lock, t1);
582	+	waitForQueuedThread(lock, t2);
583	+	assertTrue(lock.isWriteLockedByCurrentThread());
584		lock.readLock().lock();
585		lock.readLock().unlock();
586	<	Thread.sleep(SHORT_DELAY_MS);
587	<	lock.readLock().lock();
588	<	lock.readLock().unlock();
521	<	lock.writeLock().unlock();
522	<	awaitTermination(t1, LONG_DELAY_MS);
523	<	awaitTermination(t2, LONG_DELAY_MS);
586	>	releaseWriteLock(lock);
587	>	awaitTermination(t1);
588	>	awaitTermination(t2);
589		}
590
526	–
591		/**
592		* Fair Write lock succeeds if write locked by current thread even if
593		* other threads are waiting for writelock
#	Line 542 | Line 606 | public class ReentrantReadWriteLockTest
606		lock.writeLock().unlock();
607		}});
608
609	<	Thread.sleep(SHORT_DELAY_MS);
609	>	waitForQueuedThread(lock, t1);
610	>	waitForQueuedThread(lock, t2);
611		assertTrue(lock.isWriteLockedByCurrentThread());
612		assertEquals(1, lock.getWriteHoldCount());
613		lock.writeLock().lock();
#	Line 550 | Line 615 | public class ReentrantReadWriteLockTest
615		lock.writeLock().unlock();
616		lock.writeLock().lock();
617		lock.writeLock().unlock();
618	<	lock.writeLock().unlock();
619	<	awaitTermination(t1, LONG_DELAY_MS);
620	<	awaitTermination(t2, LONG_DELAY_MS);
618	>	releaseWriteLock(lock);
619	>	awaitTermination(t1);
620	>	awaitTermination(t2);
621		}
622
558	–
623		/**
624		* Read tryLock succeeds if readlocked but not writelocked
625		*/
#	Line 568 | Line 632 | public class ReentrantReadWriteLockTest
632		lock.readLock().unlock();
633		}});
634
635	<	awaitTermination(t, LONG_DELAY_MS);
635	>	awaitTermination(t);
636		lock.readLock().unlock();
637		}
638
#	Line 583 | Line 647 | public class ReentrantReadWriteLockTest
647		assertFalse(lock.writeLock().tryLock());
648		}});
649
650	<	awaitTermination(t, LONG_DELAY_MS);
650	>	awaitTermination(t);
651		lock.readLock().unlock();
652		}
653
590	–
654		/**
655		* Fair Read tryLock succeeds if readlocked but not writelocked
656		*/
#	Line 600 | Line 663 | public class ReentrantReadWriteLockTest
663		lock.readLock().unlock();
664		}});
665
666	<	awaitTermination(t, LONG_DELAY_MS);
666	>	awaitTermination(t);
667		lock.readLock().unlock();
668		}
669
607	–
608	–
670		/**
671		* Fair write tryLock fails when readlocked
672		*/
#	Line 617 | Line 678 | public class ReentrantReadWriteLockTest
678		assertFalse(lock.writeLock().tryLock());
679		}});
680
681	<	awaitTermination(t, LONG_DELAY_MS);
681	>	awaitTermination(t);
682		lock.readLock().unlock();
683		}
684
624	–
625	–
685		/**
686		* write timed tryLock times out if locked
687		*/
#	Line 634 | Line 693 | public class ReentrantReadWriteLockTest
693		assertFalse(lock.writeLock().tryLock(1, MILLISECONDS));
694		}});
695
696	<	awaitTermination(t, LONG_DELAY_MS);
696	>	awaitTermination(t);
697		assertTrue(lock.writeLock().isHeldByCurrentThread());
698		lock.writeLock().unlock();
699		}
#	Line 650 | Line 709 | public class ReentrantReadWriteLockTest
709		assertFalse(lock.readLock().tryLock(1, MILLISECONDS));
710		}});
711
712	<	awaitTermination(t, LONG_DELAY_MS);
712	>	awaitTermination(t);
713		assertTrue(lock.writeLock().isHeldByCurrentThread());
714		lock.writeLock().unlock();
715		}
716
658	–
717		/**
718		* write lockInterruptibly succeeds if lock free else is interruptible
719		*/
#	Line 667 | Line 725 | public class ReentrantReadWriteLockTest
725		lock.writeLock().lockInterruptibly();
726		}});
727
728	<	Thread.sleep(SHORT_DELAY_MS);
728	>	waitForQueuedThread(lock, t);
729		t.interrupt();
730	<	awaitTermination(t, LONG_DELAY_MS);
730	>	awaitTermination(t);
731		releaseWriteLock(lock);
732		}
733
#	Line 684 | Line 742 | public class ReentrantReadWriteLockTest
742		lock.readLock().lockInterruptibly();
743		}});
744
745	<	Thread.sleep(SHORT_DELAY_MS);
745	>	waitForQueuedThread(lock, t);
746		t.interrupt();
747	<	awaitTermination(t, LONG_DELAY_MS);
747	>	awaitTermination(t);
748		releaseWriteLock(lock);
749		}
750
#	Line 700 | Line 758 | public class ReentrantReadWriteLockTest
758		c.await();
759		shouldThrow();
760		} catch (IllegalMonitorStateException success) {}
761	+	try {
762	+	c.await(LONG_DELAY_MS, MILLISECONDS);
763	+	shouldThrow();
764	+	} catch (IllegalMonitorStateException success) {}
765	+	try {
766	+	c.awaitNanos(100);
767	+	shouldThrow();
768	+	} catch (IllegalMonitorStateException success) {}
769	+	try {
770	+	c.awaitUninterruptibly();
771	+	shouldThrow();
772	+	} catch (IllegalMonitorStateException success) {}
773		}
774
775		/**
#	Line 715 | Line 785 | public class ReentrantReadWriteLockTest
785		}
786
787		/**
788	+	* Calling signalAll without holding lock throws IllegalMonitorStateException
789	+	*/
790	+	public void testSignalAll_IllegalMonitor() {
791	+	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
792	+	final Condition c = lock.writeLock().newCondition();
793	+	try {
794	+	c.signalAll();
795	+	shouldThrow();
796	+	} catch (IllegalMonitorStateException success) {}
797	+	}
798	+
799	+	/**
800		* awaitNanos without a signal times out
801		*/
802		public void testAwaitNanos_Timeout() throws InterruptedException {
803		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
804		final Condition c = lock.writeLock().newCondition();
723	–
805		lock.writeLock().lock();
806	<	long t = c.awaitNanos(100);
807	<	assertTrue(t <= 0);
806	>	long startTime = System.nanoTime();
807	>	long timeoutMillis = 10;
808	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
809	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
810	>	assertTrue(nanosRemaining <= 0);
811	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
812		lock.writeLock().unlock();
813		}
814
730	–
815		/**
816		* timed await without a signal times out
817		*/
#	Line 735 | Line 819 | public class ReentrantReadWriteLockTest
819		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
820		final Condition c = lock.writeLock().newCondition();
821		lock.writeLock().lock();
822	<	assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
822	>	long startTime = System.nanoTime();
823	>	long timeoutMillis = 10;
824	>	assertFalse(c.await(timeoutMillis, MILLISECONDS));
825	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
826		lock.writeLock().unlock();
827		}
828
#	Line 757 | Line 844 | public class ReentrantReadWriteLockTest
844		public void testAwait() throws InterruptedException {
845		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
846		final Condition c = lock.writeLock().newCondition();
847	+	final CountDownLatch locked = new CountDownLatch(1);
848		Thread t = newStartedThread(new CheckedRunnable() {
849		public void realRun() throws InterruptedException {
850		lock.writeLock().lock();
851	+	locked.countDown();
852		c.await();
853		lock.writeLock().unlock();
854		}});
855
856	<	Thread.sleep(SHORT_DELAY_MS);
856	>	locked.await();
857		lock.writeLock().lock();
858		c.signal();
859	+	assertTrue(t.isAlive());
860		lock.writeLock().unlock();
861	<	awaitTermination(t, LONG_DELAY_MS);
772	<	}
773	<
774	<	/** A helper class for uninterruptible wait tests */
775	<	class UninterruptableThread extends Thread {
776	<	private Lock lock;
777	<	private Condition c;
778	<
779	<	public volatile boolean canAwake = false;
780	<	public volatile boolean interrupted = false;
781	<	public volatile boolean lockStarted = false;
782	<
783	<	public UninterruptableThread(Lock lock, Condition c) {
784	<	this.lock = lock;
785	<	this.c = c;
786	<	}
787	<
788	<	public synchronized void run() {
789	<	lock.lock();
790	<	lockStarted = true;
791	<
792	<	while (!canAwake) {
793	<	c.awaitUninterruptibly();
794	<	}
795	<
796	<	interrupted = isInterrupted();
797	<	lock.unlock();
798	<	}
861	>	awaitTermination(t);
862		}
863
864		/**
#	Line 804 | Line 867 | public class ReentrantReadWriteLockTest
867		public void testAwaitUninterruptibly() throws InterruptedException {
868		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
869		final Condition c = lock.writeLock().newCondition();
870	<	UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
871	<
872	<	thread.start();
873	<
874	<	while (!thread.lockStarted) {
875	<	Thread.sleep(100);
876	<	}
870	>	final CountDownLatch locked = new CountDownLatch(1);
871	>	final AtomicBoolean canAwake = new AtomicBoolean(false);
872	>	Thread t = newStartedThread(new CheckedRunnable() {
873	>	public void realRun() {
874	>	lock.writeLock().lock();
875	>	locked.countDown();
876	>	c.awaitUninterruptibly();
877	>	assertTrue(Thread.interrupted());
878	>	lock.writeLock().unlock();
879	>	}});
880
881	+	locked.await();
882		lock.writeLock().lock();
883	<	try {
884	<	thread.interrupt();
885	<	thread.canAwake = true;
886	<	c.signal();
887	<	} finally {
888	<	lock.writeLock().unlock();
889	<	}
890	<
824	<	awaitTermination(thread, LONG_DELAY_MS);
825	<	assertTrue(thread.interrupted);
883	>	lock.writeLock().unlock();
884	>	t.interrupt();
885	>	t.join(10);
886	>	assertTrue(t.isAlive());
887	>	lock.writeLock().lock();
888	>	c.signal();
889	>	lock.writeLock().unlock();
890	>	awaitTermination(t);
891		}
892
893		/**
894		* await is interruptible
895		*/
896		public void testAwait_Interrupt() throws InterruptedException {
897	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
897	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
898		final Condition c = lock.writeLock().newCondition();
899		final CountDownLatch locked = new CountDownLatch(1);
900		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
901		public void realRun() throws InterruptedException {
902		lock.writeLock().lock();
903		assertTrue(lock.isWriteLocked());
904	+	assertTrue(lock.isWriteLockedByCurrentThread());
905	+	assertHasNoWaiters(lock, c);
906		locked.countDown();
907	<	try { c.await(); }
908	<	finally { lock.writeLock().unlock(); }
907	>	try {
908	>	c.await();
909	>	} finally {
910	>	assertTrue(lock.isWriteLocked());
911	>	assertTrue(lock.isWriteLockedByCurrentThread());
912	>	assertHasNoWaiters(lock, c);
913	>	lock.writeLock().unlock();
914	>	assertFalse(Thread.interrupted());
915	>	}
916		}});
917
918		locked.await();
919	<	while (lock.isWriteLocked())
846	<	Thread.yield();
919	>	assertHasWaiters(lock, c, t);
920		t.interrupt();
921	<	awaitTermination(t, LONG_DELAY_MS);
921	>	awaitTermination(t);
922		assertFalse(lock.isWriteLocked());
923		}
924
#	Line 853 | Line 926 | public class ReentrantReadWriteLockTest
926		* awaitNanos is interruptible
927		*/
928		public void testAwaitNanos_Interrupt() throws InterruptedException {
929	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
929	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
930		final Condition c = lock.writeLock().newCondition();
931		final CountDownLatch locked = new CountDownLatch(1);
932		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
933		public void realRun() throws InterruptedException {
934		lock.writeLock().lock();
935		assertTrue(lock.isWriteLocked());
936	+	assertTrue(lock.isWriteLockedByCurrentThread());
937	+	assertHasNoWaiters(lock, c);
938		locked.countDown();
939	<	try { c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS)); }
940	<	finally { lock.writeLock().unlock(); }
939	>	try {
940	>	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
941	>	} finally {
942	>	assertTrue(lock.isWriteLocked());
943	>	assertTrue(lock.isWriteLockedByCurrentThread());
944	>	assertHasNoWaiters(lock, c);
945	>	lock.writeLock().unlock();
946	>	assertFalse(Thread.interrupted());
947	>	}
948		}});
949
950		locked.await();
951	<	while (lock.isWriteLocked())
870	<	Thread.yield();
951	>	assertHasWaiters(lock, c, t);
952		t.interrupt();
953	<	awaitTermination(t, LONG_DELAY_MS);
953	>	awaitTermination(t);
954		assertFalse(lock.isWriteLocked());
955		}
956
#	Line 877 | Line 958 | public class ReentrantReadWriteLockTest
958		* awaitUntil is interruptible
959		*/
960		public void testAwaitUntil_Interrupt() throws InterruptedException {
961	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
961	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
962		final Condition c = lock.writeLock().newCondition();
963		final CountDownLatch locked = new CountDownLatch(1);
964		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
965		public void realRun() throws InterruptedException {
966		lock.writeLock().lock();
967		assertTrue(lock.isWriteLocked());
968	+	assertTrue(lock.isWriteLockedByCurrentThread());
969	+	assertHasNoWaiters(lock, c);
970		locked.countDown();
971		java.util.Date d = new java.util.Date();
972	<	try { c.awaitUntil(new java.util.Date(d.getTime() + 10000)); }
973	<	finally { lock.writeLock().unlock(); }
972	>	try {
973	>	c.awaitUntil(new java.util.Date(d.getTime() + 10000));
974	>	} finally {
975	>	assertTrue(lock.isWriteLocked());
976	>	assertTrue(lock.isWriteLockedByCurrentThread());
977	>	assertHasNoWaiters(lock, c);
978	>	lock.writeLock().unlock();
979	>	assertFalse(Thread.interrupted());
980	>	}
981		}});
982
983		locked.await();
984	<	while (lock.isWriteLocked())
895	<	Thread.yield();
984	>	assertHasWaiters(lock, c, t);
985		t.interrupt();
986	<	awaitTermination(t, LONG_DELAY_MS);
986	>	awaitTermination(t);
987		assertFalse(lock.isWriteLocked());
988		}
989
#	Line 902 | Line 991 | public class ReentrantReadWriteLockTest
991		* signalAll wakes up all threads
992		*/
993		public void testSignalAll() throws InterruptedException {
994	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
994	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
995		final Condition c = lock.writeLock().newCondition();
996	+	final CountDownLatch locked = new CountDownLatch(2);
997	+	final Lock writeLock = lock.writeLock();
998		Thread t1 = newStartedThread(new CheckedRunnable() {
999		public void realRun() throws InterruptedException {
1000	<	lock.writeLock().lock();
1000	>	writeLock.lock();
1001	>	locked.countDown();
1002		c.await();
1003	<	lock.writeLock().unlock();
1003	>	writeLock.unlock();
1004		}});
1005
1006		Thread t2 = newStartedThread(new CheckedRunnable() {
1007		public void realRun() throws InterruptedException {
1008	<	lock.writeLock().lock();
1008	>	writeLock.lock();
1009	>	locked.countDown();
1010		c.await();
1011	<	lock.writeLock().unlock();
1011	>	writeLock.unlock();
1012		}});
1013
1014	<	Thread.sleep(SHORT_DELAY_MS);
1015	<	lock.writeLock().lock();
1014	>	locked.await();
1015	>	writeLock.lock();
1016	>	assertHasWaiters(lock, c, t1, t2);
1017		c.signalAll();
1018	<	lock.writeLock().unlock();
1019	<	awaitTermination(t1, LONG_DELAY_MS);
1020	<	awaitTermination(t2, LONG_DELAY_MS);
1018	>	assertHasNoWaiters(lock, c);
1019	>	writeLock.unlock();
1020	>	awaitTermination(t1);
1021	>	awaitTermination(t2);
1022	>	}
1023	>
1024	>	/**
1025	>	* signal wakes up waiting threads in FIFO order.
1026	>	*/
1027	>	public void testSignalWakesFifo() throws InterruptedException {
1028	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1029	>	final Condition c = lock.writeLock().newCondition();
1030	>	final CountDownLatch locked1 = new CountDownLatch(1);
1031	>	final CountDownLatch locked2 = new CountDownLatch(1);
1032	>	final Lock writeLock = lock.writeLock();
1033	>	Thread t1 = newStartedThread(new CheckedRunnable() {
1034	>	public void realRun() throws InterruptedException {
1035	>	writeLock.lock();
1036	>	locked1.countDown();
1037	>	c.await();
1038	>	writeLock.unlock();
1039	>	}});
1040	>
1041	>	locked1.await();
1042	>
1043	>	Thread t2 = newStartedThread(new CheckedRunnable() {
1044	>	public void realRun() throws InterruptedException {
1045	>	writeLock.lock();
1046	>	locked2.countDown();
1047	>	c.await();
1048	>	writeLock.unlock();
1049	>	}});
1050	>
1051	>	locked2.await();
1052	>
1053	>	writeLock.lock();
1054	>	assertHasWaiters(lock, c, t1, t2);
1055	>	assertFalse(lock.hasQueuedThreads());
1056	>	c.signal();
1057	>	assertHasWaiters(lock, c, t2);
1058	>	assertTrue(lock.hasQueuedThread(t1));
1059	>	assertFalse(lock.hasQueuedThread(t2));
1060	>	c.signal();
1061	>	assertHasNoWaiters(lock, c);
1062	>	assertTrue(lock.hasQueuedThread(t1));
1063	>	assertTrue(lock.hasQueuedThread(t2));
1064	>	writeLock.unlock();
1065	>	awaitTermination(t1);
1066	>	awaitTermination(t2);
1067		}
1068
1069		/**
#	Line 955 | Line 1095 | public class ReentrantReadWriteLockTest
1095		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1096		assertFalse(lock.hasQueuedThreads());
1097		lock.writeLock().lock();
1098	+	assertFalse(lock.hasQueuedThreads());
1099	+	long startTime = System.nanoTime();
1100		t1.start();
1101	<	Thread.sleep(SHORT_DELAY_MS);
960	<	assertTrue(lock.hasQueuedThreads());
1101	>	waitForQueuedThread(lock, t1);
1102		t2.start();
1103	<	Thread.sleep(SHORT_DELAY_MS);
1103	>	waitForQueuedThread(lock, t2);
1104		assertTrue(lock.hasQueuedThreads());
1105		t1.interrupt();
1106	<	Thread.sleep(SHORT_DELAY_MS);
1106	>	awaitTermination(t1);
1107		assertTrue(lock.hasQueuedThreads());
1108		lock.writeLock().unlock();
1109	<	Thread.sleep(SHORT_DELAY_MS);
1109	>	awaitTermination(t2);
1110		assertFalse(lock.hasQueuedThreads());
970	–	awaitTermination(t1, LONG_DELAY_MS);
971	–	awaitTermination(t2, LONG_DELAY_MS);
1111		}
1112
1113		/**
#	Line 986 | Line 1125 | public class ReentrantReadWriteLockTest
1125		* hasQueuedThread reports whether a thread is queued.
1126		*/
1127		public void testHasQueuedThread() throws InterruptedException {
1128	<	final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1129	<	Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1130	<	Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
1131	<	assertFalse(sync.hasQueuedThread(t1));
1132	<	assertFalse(sync.hasQueuedThread(t2));
1133	<	sync.writeLock().lock();
1128	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1129	>	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1130	>	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1131	>	assertFalse(lock.hasQueuedThread(t1));
1132	>	assertFalse(lock.hasQueuedThread(t2));
1133	>	lock.writeLock().lock();
1134	>	long startTime = System.nanoTime();
1135		t1.start();
1136	<	Thread.sleep(SHORT_DELAY_MS);
1137	<	assertTrue(sync.hasQueuedThread(t1));
1136	>	waitForQueuedThread(lock, t1);
1137	>	assertTrue(lock.hasQueuedThread(t1));
1138	>	assertFalse(lock.hasQueuedThread(t2));
1139		t2.start();
1140	<	Thread.sleep(SHORT_DELAY_MS);
1141	<	assertTrue(sync.hasQueuedThread(t1));
1142	<	assertTrue(sync.hasQueuedThread(t2));
1140	>	waitForQueuedThread(lock, t2);
1141	>	assertTrue(lock.hasQueuedThread(t1));
1142	>	assertTrue(lock.hasQueuedThread(t2));
1143		t1.interrupt();
1144	<	Thread.sleep(SHORT_DELAY_MS);
1145	<	assertFalse(sync.hasQueuedThread(t1));
1146	<	assertTrue(sync.hasQueuedThread(t2));
1147	<	sync.writeLock().unlock();
1148	<	Thread.sleep(SHORT_DELAY_MS);
1149	<	assertFalse(sync.hasQueuedThread(t1));
1150	<	Thread.sleep(SHORT_DELAY_MS);
1010	<	assertFalse(sync.hasQueuedThread(t2));
1011	<	awaitTermination(t1, LONG_DELAY_MS);
1012	<	awaitTermination(t2, LONG_DELAY_MS);
1144	>	awaitTermination(t1);
1145	>	assertFalse(lock.hasQueuedThread(t1));
1146	>	assertTrue(lock.hasQueuedThread(t2));
1147	>	lock.writeLock().unlock();
1148	>	awaitTermination(t2);
1149	>	assertFalse(lock.hasQueuedThread(t1));
1150	>	assertFalse(lock.hasQueuedThread(t2));
1151		}
1152
1015	–
1153		/**
1154		* getQueueLength reports number of waiting threads
1155		*/
#	Line 1022 | Line 1159 | public class ReentrantReadWriteLockTest
1159		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1160		assertEquals(0, lock.getQueueLength());
1161		lock.writeLock().lock();
1162	+	long startTime = System.nanoTime();
1163		t1.start();
1164	<	Thread.sleep(SHORT_DELAY_MS);
1164	>	waitForQueuedThread(lock, t1);
1165		assertEquals(1, lock.getQueueLength());
1166		t2.start();
1167	<	Thread.sleep(SHORT_DELAY_MS);
1167	>	waitForQueuedThread(lock, t2);
1168		assertEquals(2, lock.getQueueLength());
1169		t1.interrupt();
1170	<	Thread.sleep(SHORT_DELAY_MS);
1170	>	awaitTermination(t1);
1171		assertEquals(1, lock.getQueueLength());
1172		lock.writeLock().unlock();
1173	<	Thread.sleep(SHORT_DELAY_MS);
1173	>	awaitTermination(t2);
1174		assertEquals(0, lock.getQueueLength());
1037	–	awaitTermination(t1, LONG_DELAY_MS);
1038	–	awaitTermination(t2, LONG_DELAY_MS);
1175		}
1176
1177		/**
#	Line 1047 | Line 1183 | public class ReentrantReadWriteLockTest
1183		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
1184		assertTrue(lock.getQueuedThreads().isEmpty());
1185		lock.writeLock().lock();
1186	+	long startTime = System.nanoTime();
1187		assertTrue(lock.getQueuedThreads().isEmpty());
1188		t1.start();
1189	<	Thread.sleep(SHORT_DELAY_MS);
1189	>	waitForQueuedThread(lock, t1);
1190	>	assertEquals(1, lock.getQueuedThreads().size());
1191		assertTrue(lock.getQueuedThreads().contains(t1));
1192		t2.start();
1193	<	Thread.sleep(SHORT_DELAY_MS);
1193	>	waitForQueuedThread(lock, t2);
1194	>	assertEquals(2, lock.getQueuedThreads().size());
1195		assertTrue(lock.getQueuedThreads().contains(t1));
1196		assertTrue(lock.getQueuedThreads().contains(t2));
1197		t1.interrupt();
1198	<	Thread.sleep(SHORT_DELAY_MS);
1198	>	awaitTermination(t1);
1199		assertFalse(lock.getQueuedThreads().contains(t1));
1200		assertTrue(lock.getQueuedThreads().contains(t2));
1201	+	assertEquals(1, lock.getQueuedThreads().size());
1202		lock.writeLock().unlock();
1203	<	Thread.sleep(SHORT_DELAY_MS);
1203	>	awaitTermination(t2);
1204		assertTrue(lock.getQueuedThreads().isEmpty());
1065	–	awaitTermination(t1, LONG_DELAY_MS);
1066	–	awaitTermination(t2, LONG_DELAY_MS);
1205		}
1206
1207		/**
#	Line 1088 | Line 1226 | public class ReentrantReadWriteLockTest
1226		} catch (NullPointerException success) {}
1227		}
1228
1091	–
1229		/**
1230		* getWaitingThreads throws NPE if null
1231		*/
#	Line 1125 | Line 1262 | public class ReentrantReadWriteLockTest
1262		} catch (IllegalMonitorStateException success) {}
1263		}
1264
1128	–
1265		/**
1266		* getWaitQueueLength throws IAE if not owned
1267		*/
#	Line 1151 | Line 1287 | public class ReentrantReadWriteLockTest
1287		} catch (IllegalMonitorStateException success) {}
1288		}
1289
1154	–
1290		/**
1291		* getWaitingThreads throws IAE if not owned
1292		*/
#	Line 1177 | Line 1312 | public class ReentrantReadWriteLockTest
1312		} catch (IllegalMonitorStateException success) {}
1313		}
1314
1180	–
1315		/**
1316		* hasWaiters returns true when a thread is waiting, else false
1317		*/
1318		public void testHasWaiters() throws InterruptedException {
1319	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1319	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1320		final Condition c = lock.writeLock().newCondition();
1321	+	final CountDownLatch locked = new CountDownLatch(1);
1322		Thread t = newStartedThread(new CheckedRunnable() {
1323		public void realRun() throws InterruptedException {
1324		lock.writeLock().lock();
1325		assertFalse(lock.hasWaiters(c));
1326	+	locked.countDown();
1327		assertEquals(0, lock.getWaitQueueLength(c));
1328		c.await();
1329		lock.writeLock().unlock();
1330		}});
1331
1332	<	Thread.sleep(SHORT_DELAY_MS);
1332	>	locked.await();
1333		lock.writeLock().lock();
1334		assertTrue(lock.hasWaiters(c));
1335		assertEquals(1, lock.getWaitQueueLength(c));
1336		c.signal();
1337	+	assertHasNoWaiters(lock, c);
1338		lock.writeLock().unlock();
1339	<	Thread.sleep(SHORT_DELAY_MS);
1340	<	lock.writeLock().lock();
1204	<	assertFalse(lock.hasWaiters(c));
1205	<	assertEquals(0, lock.getWaitQueueLength(c));
1206	<	lock.writeLock().unlock();
1207	<	awaitTermination(t, LONG_DELAY_MS);
1339	>	awaitTermination(t);
1340	>	assertHasNoWaiters(lock, c);
1341		}
1342
1343		/**
1344		* getWaitQueueLength returns number of waiting threads
1345		*/
1346		public void testGetWaitQueueLength() throws InterruptedException {
1347	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1347	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1348		final Condition c = lock.writeLock().newCondition();
1349	+	final CountDownLatch locked = new CountDownLatch(1);
1350		Thread t = newStartedThread(new CheckedRunnable() {
1351		public void realRun() throws InterruptedException {
1352		lock.writeLock().lock();
1219	–	assertFalse(lock.hasWaiters(c));
1353		assertEquals(0, lock.getWaitQueueLength(c));
1354	+	locked.countDown();
1355		c.await();
1356		lock.writeLock().unlock();
1357		}});
1358
1359	<	Thread.sleep(SHORT_DELAY_MS);
1359	>	locked.await();
1360		lock.writeLock().lock();
1361	<	assertTrue(lock.hasWaiters(c));
1361	>	assertHasWaiters(lock, c, t);
1362		assertEquals(1, lock.getWaitQueueLength(c));
1363		c.signal();
1364	<	lock.writeLock().unlock();
1231	<	Thread.sleep(SHORT_DELAY_MS);
1232	<	lock.writeLock().lock();
1233	<	assertFalse(lock.hasWaiters(c));
1364	>	assertHasNoWaiters(lock, c);
1365		assertEquals(0, lock.getWaitQueueLength(c));
1366		lock.writeLock().unlock();
1367	<	awaitTermination(t, LONG_DELAY_MS);
1367	>	awaitTermination(t);
1368		}
1369
1239	–
1370		/**
1371		* getWaitingThreads returns only and all waiting threads
1372		*/
1373		public void testGetWaitingThreads() throws InterruptedException {
1374		final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1375		final Condition c = lock.writeLock().newCondition();
1376	+	final CountDownLatch locked1 = new CountDownLatch(1);
1377	+	final CountDownLatch locked2 = new CountDownLatch(1);
1378		Thread t1 = new Thread(new CheckedRunnable() {
1379		public void realRun() throws InterruptedException {
1380		lock.writeLock().lock();
1381		assertTrue(lock.getWaitingThreads(c).isEmpty());
1382	+	locked1.countDown();
1383		c.await();
1384		lock.writeLock().unlock();
1385		}});
#	Line 1255 | Line 1388 | public class ReentrantReadWriteLockTest
1388		public void realRun() throws InterruptedException {
1389		lock.writeLock().lock();
1390		assertFalse(lock.getWaitingThreads(c).isEmpty());
1391	+	locked2.countDown();
1392		c.await();
1393		lock.writeLock().unlock();
1394		}});
#	Line 1262 | Line 1396 | public class ReentrantReadWriteLockTest
1396		lock.writeLock().lock();
1397		assertTrue(lock.getWaitingThreads(c).isEmpty());
1398		lock.writeLock().unlock();
1399	+
1400		t1.start();
1401	<	Thread.sleep(SHORT_DELAY_MS);
1401	>	locked1.await();
1402		t2.start();
1403	<	Thread.sleep(SHORT_DELAY_MS);
1403	>	locked2.await();
1404	>
1405		lock.writeLock().lock();
1406		assertTrue(lock.hasWaiters(c));
1407		assertTrue(lock.getWaitingThreads(c).contains(t1));
1408		assertTrue(lock.getWaitingThreads(c).contains(t2));
1409	+	assertEquals(2, lock.getWaitingThreads(c).size());
1410		c.signalAll();
1411	+	assertHasNoWaiters(lock, c);
1412		lock.writeLock().unlock();
1413	<	Thread.sleep(SHORT_DELAY_MS);
1414	<	lock.writeLock().lock();
1415	<	assertFalse(lock.hasWaiters(c));
1416	<	assertTrue(lock.getWaitingThreads(c).isEmpty());
1417	<	lock.writeLock().unlock();
1280	<	awaitTermination(t1, LONG_DELAY_MS);
1281	<	awaitTermination(t2, LONG_DELAY_MS);
1413	>
1414	>	awaitTermination(t1);
1415	>	awaitTermination(t2);
1416	>
1417	>	assertHasNoWaiters(lock, c);
1418		}
1419
1420		/**

Diff Legend

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