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.19 by dl, Sun Jan 25 13:25:28 2004 UTC vs.
Revision 1.28 by jsr166, Mon Nov 2 20:28:31 2009 UTC

#	Line 2 | Line 2
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4		* http://creativecommons.org/licenses/publicdomain
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
#	Line 14 | Line 14 | import java.util.*;
14
15		public class ReentrantReadWriteLockTest extends JSR166TestCase {
16		public static void main(String[] args) {
17	<	junit.textui.TestRunner.run (suite());
17	>	junit.textui.TestRunner.run (suite());
18		}
19		public static Test suite() {
20		return new TestSuite(ReentrantReadWriteLockTest.class);
#	Line 54 | Line 54 | public class ReentrantReadWriteLockTest
54		*/
55		static class PublicReentrantReadWriteLock extends ReentrantReadWriteLock {
56		PublicReentrantReadWriteLock() { super(); }
57	<	public Collection<Thread> getQueuedThreads() {
58	<	return super.getQueuedThreads();
57	>	public Collection<Thread> getQueuedThreads() {
58	>	return super.getQueuedThreads();
59		}
60	<	public Collection<Thread> getWaitingThreads(Condition c) {
61	<	return super.getWaitingThreads(c);
60	>	public Collection<Thread> getWaitingThreads(Condition c) {
61	>	return super.getWaitingThreads(c);
62		}
63		}
64
65		/**
66		* Constructor sets given fairness, and is in unlocked state
67		*/
68	<	public void testConstructor() {
68	>	public void testConstructor() {
69		ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
70		assertFalse(rl.isFair());
71		assertFalse(rl.isWriteLocked());
#	Line 79 | Line 79 | public class ReentrantReadWriteLockTest
79		/**
80		* write-locking and read-locking an unlocked lock succeed
81		*/
82	<	public void testLock() {
82	>	public void testLock() {
83		ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
84		rl.writeLock().lock();
85		assertTrue(rl.isWriteLocked());
86		assertTrue(rl.isWriteLockedByCurrentThread());
87	+	assertTrue(rl.writeLock().isHeldByCurrentThread());
88		assertEquals(0, rl.getReadLockCount());
89		rl.writeLock().unlock();
90		assertFalse(rl.isWriteLocked());
91		assertFalse(rl.isWriteLockedByCurrentThread());
92	+	assertFalse(rl.writeLock().isHeldByCurrentThread());
93		assertEquals(0, rl.getReadLockCount());
94		rl.readLock().lock();
95		assertFalse(rl.isWriteLocked());
#	Line 103 | Line 105 | public class ReentrantReadWriteLockTest
105		/**
106		* locking an unlocked fair lock succeeds
107		*/
108	<	public void testFairLock() {
108	>	public void testFairLock() {
109		ReentrantReadWriteLock rl = new ReentrantReadWriteLock(true);
110		rl.writeLock().lock();
111		assertTrue(rl.isWriteLocked());
112		assertTrue(rl.isWriteLockedByCurrentThread());
113	+	assertTrue(rl.writeLock().isHeldByCurrentThread());
114		assertEquals(0, rl.getReadLockCount());
115		rl.writeLock().unlock();
116		assertFalse(rl.isWriteLocked());
117		assertFalse(rl.isWriteLockedByCurrentThread());
118	+	assertFalse(rl.writeLock().isHeldByCurrentThread());
119		assertEquals(0, rl.getReadLockCount());
120		rl.readLock().lock();
121		assertFalse(rl.isWriteLocked());
#	Line 126 | Line 130 | public class ReentrantReadWriteLockTest
130		/**
131		* getWriteHoldCount returns number of recursive holds
132		*/
133	<	public void testGetHoldCount() {
133	>	public void testGetWriteHoldCount() {
134		ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
135		for(int i = 1; i <= SIZE; i++) {
136		lock.writeLock().lock();
#	Line 137 | Line 141 | public class ReentrantReadWriteLockTest
141		assertEquals(i-1,lock.getWriteHoldCount());
142		}
143		}
144	<
144	>
145	>	/**
146	>	* WriteLock.getHoldCount returns number of recursive holds
147	>	*/
148	>	public void testGetHoldCount() {
149	>	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
150	>	for(int i = 1; i <= SIZE; i++) {
151	>	lock.writeLock().lock();
152	>	assertEquals(i,lock.writeLock().getHoldCount());
153	>	}
154	>	for(int i = SIZE; i > 0; i--) {
155	>	lock.writeLock().unlock();
156	>	assertEquals(i-1,lock.writeLock().getHoldCount());
157	>	}
158	>	}
159	>
160	>	/**
161	>	* getReadHoldCount returns number of recursive holds
162	>	*/
163	>	public void testGetReadHoldCount() {
164	>	ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
165	>	for(int i = 1; i <= SIZE; i++) {
166	>	lock.readLock().lock();
167	>	assertEquals(i,lock.getReadHoldCount());
168	>	}
169	>	for(int i = SIZE; i > 0; i--) {
170	>	lock.readLock().unlock();
171	>	assertEquals(i-1,lock.getReadHoldCount());
172	>	}
173	>	}
174	>
175
176		/**
177		* write-unlocking an unlocked lock throws IllegalMonitorStateException
178		*/
179	<	public void testUnlock_IllegalMonitorStateException() {
179	>	public void testUnlock_IllegalMonitorStateException() {
180		ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
181		try {
182		rl.writeLock().unlock();
#	Line 154 | Line 188 | public class ReentrantReadWriteLockTest
188		/**
189		* write-lockInterruptibly is interruptible
190		*/
191	<	public void testWriteLockInterruptibly_Interrupted() {
191	>	public void testWriteLockInterruptibly_Interrupted() {
192		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
193		Thread t = new Thread(new Runnable() {
194		public void run() {
#	Line 169 | Line 203 | public class ReentrantReadWriteLockTest
203		try {
204		lock.writeLock().lock();
205		t.start();
206	+	Thread.sleep(SHORT_DELAY_MS);
207		t.interrupt();
208	+	Thread.sleep(SHORT_DELAY_MS);
209		lock.writeLock().unlock();
210		t.join();
211		} catch(Exception e){
212		unexpectedException();
213		}
214	<	}
214	>	}
215
216		/**
217		* timed write-tryLock is interruptible
218		*/
219	<	public void testWriteTryLock_Interrupted() {
219	>	public void testWriteTryLock_Interrupted() {
220		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
221		lock.writeLock().lock();
222		Thread t = new Thread(new Runnable() {
#	Line 203 | Line 239 | public class ReentrantReadWriteLockTest
239		/**
240		* read-lockInterruptibly is interruptible
241		*/
242	<	public void testReadLockInterruptibly_Interrupted() {
242	>	public void testReadLockInterruptibly_Interrupted() {
243		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
244		lock.writeLock().lock();
245		Thread t = new Thread(new Runnable() {
#	Line 215 | Line 251 | public class ReentrantReadWriteLockTest
251		});
252		try {
253		t.start();
254	+	Thread.sleep(SHORT_DELAY_MS);
255		t.interrupt();
256	+	Thread.sleep(SHORT_DELAY_MS);
257		lock.writeLock().unlock();
258		t.join();
259		} catch(Exception e){
260		unexpectedException();
261		}
262	<	}
262	>	}
263
264		/**
265		* timed read-tryLock is interruptible
266		*/
267	<	public void testReadTryLock_Interrupted() {
267	>	public void testReadTryLock_Interrupted() {
268		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
269		lock.writeLock().lock();
270		Thread t = new Thread(new Runnable() {
#	Line 246 | Line 284 | public class ReentrantReadWriteLockTest
284		}
285		}
286
287	<
287	>
288		/**
289		* write-tryLock fails if locked
290		*/
291	<	public void testWriteTryLockWhenLocked() {
291	>	public void testWriteTryLockWhenLocked() {
292		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
293		lock.writeLock().lock();
294		Thread t = new Thread(new Runnable() {
#	Line 265 | Line 303 | public class ReentrantReadWriteLockTest
303		} catch(Exception e){
304		unexpectedException();
305		}
306	<	}
306	>	}
307
308		/**
309		* read-tryLock fails if locked
310		*/
311	<	public void testReadTryLockWhenLocked() {
311	>	public void testReadTryLockWhenLocked() {
312		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
313		lock.writeLock().lock();
314		Thread t = new Thread(new Runnable() {
#	Line 285 | Line 323 | public class ReentrantReadWriteLockTest
323		} catch(Exception e){
324		unexpectedException();
325		}
326	<	}
326	>	}
327
328		/**
329		* Multiple threads can hold a read lock when not write-locked
330		*/
331	<	public void testMultipleReadLocks() {
331	>	public void testMultipleReadLocks() {
332		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
333		lock.readLock().lock();
334		Thread t = new Thread(new Runnable() {
#	Line 306 | Line 344 | public class ReentrantReadWriteLockTest
344		} catch(Exception e){
345		unexpectedException();
346		}
347	<	}
347	>	}
348
349		/**
350		* A writelock succeeds after reading threads unlock
351		*/
352	<	public void testWriteAfterMultipleReadLocks() {
352	>	public void testWriteAfterMultipleReadLocks() {
353		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
354		lock.readLock().lock();
355		Thread t1 = new Thread(new Runnable() {
#	Line 336 | Line 374 | public class ReentrantReadWriteLockTest
374		t2.join(MEDIUM_DELAY_MS);
375		assertTrue(!t1.isAlive());
376		assertTrue(!t2.isAlive());
377	<
377	>
378		} catch(Exception e){
379		unexpectedException();
380		}
381	<	}
381	>	}
382
383		/**
384		* Readlocks succeed after a writing thread unlocks
385		*/
386	<	public void testReadAfterWriteLock() {
386	>	public void testReadAfterWriteLock() {
387		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
388		lock.writeLock().lock();
389		Thread t1 = new Thread(new Runnable() {
#	Line 370 | Line 408 | public class ReentrantReadWriteLockTest
408		t2.join(MEDIUM_DELAY_MS);
409		assertTrue(!t1.isAlive());
410		assertTrue(!t2.isAlive());
411	<
411	>
412	>	} catch(Exception e){
413	>	unexpectedException();
414	>	}
415	>	}
416	>
417	>	/**
418	>	* Read trylock succeeds if write locked by current thread
419	>	*/
420	>	public void testReadHoldingWriteLock() {
421	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
422	>	lock.writeLock().lock();
423	>	assertTrue(lock.readLock().tryLock());
424	>	lock.readLock().unlock();
425	>	lock.writeLock().unlock();
426	>	}
427	>
428	>	/**
429	>	* Read lock succeeds if write locked by current thread even if
430	>	* other threads are waiting for readlock
431	>	*/
432	>	public void testReadHoldingWriteLock2() {
433	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
434	>	lock.writeLock().lock();
435	>	Thread t1 = new Thread(new Runnable() {
436	>	public void run() {
437	>	lock.readLock().lock();
438	>	lock.readLock().unlock();
439	>	}
440	>	});
441	>	Thread t2 = new Thread(new Runnable() {
442	>	public void run() {
443	>	lock.readLock().lock();
444	>	lock.readLock().unlock();
445	>	}
446	>	});
447	>
448	>	try {
449	>	t1.start();
450	>	t2.start();
451	>	lock.readLock().lock();
452	>	lock.readLock().unlock();
453	>	Thread.sleep(SHORT_DELAY_MS);
454	>	lock.readLock().lock();
455	>	lock.readLock().unlock();
456	>	lock.writeLock().unlock();
457	>	t1.join(MEDIUM_DELAY_MS);
458	>	t2.join(MEDIUM_DELAY_MS);
459	>	assertTrue(!t1.isAlive());
460	>	assertTrue(!t2.isAlive());
461	>
462	>	} catch(Exception e){
463	>	unexpectedException();
464	>	}
465	>	}
466	>
467	>	/**
468	>	*  Read lock succeeds if write locked by current thread even if
469	>	* other threads are waiting for writelock
470	>	*/
471	>	public void testReadHoldingWriteLock3() {
472	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
473	>	lock.writeLock().lock();
474	>	Thread t1 = new Thread(new Runnable() {
475	>	public void run() {
476	>	lock.writeLock().lock();
477	>	lock.writeLock().unlock();
478	>	}
479	>	});
480	>	Thread t2 = new Thread(new Runnable() {
481	>	public void run() {
482	>	lock.writeLock().lock();
483	>	lock.writeLock().unlock();
484	>	}
485	>	});
486	>
487	>	try {
488	>	t1.start();
489	>	t2.start();
490	>	lock.readLock().lock();
491	>	lock.readLock().unlock();
492	>	Thread.sleep(SHORT_DELAY_MS);
493	>	lock.readLock().lock();
494	>	lock.readLock().unlock();
495	>	lock.writeLock().unlock();
496	>	t1.join(MEDIUM_DELAY_MS);
497	>	t2.join(MEDIUM_DELAY_MS);
498	>	assertTrue(!t1.isAlive());
499	>	assertTrue(!t2.isAlive());
500	>
501		} catch(Exception e){
502		unexpectedException();
503		}
504	<	}
504	>	}
505	>
506	>
507	>	/**
508	>	*  Write lock succeeds if write locked by current thread even if
509	>	* other threads are waiting for writelock
510	>	*/
511	>	public void testWriteHoldingWriteLock4() {
512	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
513	>	lock.writeLock().lock();
514	>	Thread t1 = new Thread(new Runnable() {
515	>	public void run() {
516	>	lock.writeLock().lock();
517	>	lock.writeLock().unlock();
518	>	}
519	>	});
520	>	Thread t2 = new Thread(new Runnable() {
521	>	public void run() {
522	>	lock.writeLock().lock();
523	>	lock.writeLock().unlock();
524	>	}
525	>	});
526	>
527	>	try {
528	>	t1.start();
529	>	t2.start();
530	>	lock.writeLock().lock();
531	>	lock.writeLock().unlock();
532	>	Thread.sleep(SHORT_DELAY_MS);
533	>	lock.writeLock().lock();
534	>	lock.writeLock().unlock();
535	>	lock.writeLock().unlock();
536	>	t1.join(MEDIUM_DELAY_MS);
537	>	t2.join(MEDIUM_DELAY_MS);
538	>	assertTrue(!t1.isAlive());
539	>	assertTrue(!t2.isAlive());
540	>
541	>	} catch(Exception e){
542	>	unexpectedException();
543	>	}
544	>	}
545	>
546	>
547	>	/**
548	>	* Fair Read trylock succeeds if write locked by current thread
549	>	*/
550	>	public void testReadHoldingWriteLockFair() {
551	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
552	>	lock.writeLock().lock();
553	>	assertTrue(lock.readLock().tryLock());
554	>	lock.readLock().unlock();
555	>	lock.writeLock().unlock();
556	>	}
557	>
558	>	/**
559	>	* Fair Read lock succeeds if write locked by current thread even if
560	>	* other threads are waiting for readlock
561	>	*/
562	>	public void testReadHoldingWriteLockFair2() {
563	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
564	>	lock.writeLock().lock();
565	>	Thread t1 = new Thread(new Runnable() {
566	>	public void run() {
567	>	lock.readLock().lock();
568	>	lock.readLock().unlock();
569	>	}
570	>	});
571	>	Thread t2 = new Thread(new Runnable() {
572	>	public void run() {
573	>	lock.readLock().lock();
574	>	lock.readLock().unlock();
575	>	}
576	>	});
577	>
578	>	try {
579	>	t1.start();
580	>	t2.start();
581	>	lock.readLock().lock();
582	>	lock.readLock().unlock();
583	>	Thread.sleep(SHORT_DELAY_MS);
584	>	lock.readLock().lock();
585	>	lock.readLock().unlock();
586	>	lock.writeLock().unlock();
587	>	t1.join(MEDIUM_DELAY_MS);
588	>	t2.join(MEDIUM_DELAY_MS);
589	>	assertTrue(!t1.isAlive());
590	>	assertTrue(!t2.isAlive());
591	>
592	>	} catch(Exception e){
593	>	unexpectedException();
594	>	}
595	>	}
596	>
597	>
598	>	/**
599	>	* Fair Read lock succeeds if write locked by current thread even if
600	>	* other threads are waiting for writelock
601	>	*/
602	>	public void testReadHoldingWriteLockFair3() {
603	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
604	>	lock.writeLock().lock();
605	>	Thread t1 = new Thread(new Runnable() {
606	>	public void run() {
607	>	lock.writeLock().lock();
608	>	lock.writeLock().unlock();
609	>	}
610	>	});
611	>	Thread t2 = new Thread(new Runnable() {
612	>	public void run() {
613	>	lock.writeLock().lock();
614	>	lock.writeLock().unlock();
615	>	}
616	>	});
617	>
618	>	try {
619	>	t1.start();
620	>	t2.start();
621	>	lock.readLock().lock();
622	>	lock.readLock().unlock();
623	>	Thread.sleep(SHORT_DELAY_MS);
624	>	lock.readLock().lock();
625	>	lock.readLock().unlock();
626	>	lock.writeLock().unlock();
627	>	t1.join(MEDIUM_DELAY_MS);
628	>	t2.join(MEDIUM_DELAY_MS);
629	>	assertTrue(!t1.isAlive());
630	>	assertTrue(!t2.isAlive());
631	>
632	>	} catch(Exception e){
633	>	unexpectedException();
634	>	}
635	>	}
636	>
637	>
638	>	/**
639	>	* Fair Write lock succeeds if write locked by current thread even if
640	>	* other threads are waiting for writelock
641	>	*/
642	>	public void testWriteHoldingWriteLockFair4() {
643	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
644	>	lock.writeLock().lock();
645	>	Thread t1 = new Thread(new Runnable() {
646	>	public void run() {
647	>	lock.writeLock().lock();
648	>	lock.writeLock().unlock();
649	>	}
650	>	});
651	>	Thread t2 = new Thread(new Runnable() {
652	>	public void run() {
653	>	lock.writeLock().lock();
654	>	lock.writeLock().unlock();
655	>	}
656	>	});
657	>
658	>	try {
659	>	t1.start();
660	>	t2.start();
661	>	Thread.sleep(SHORT_DELAY_MS);
662	>	assertTrue(lock.isWriteLockedByCurrentThread());
663	>	assertTrue(lock.getWriteHoldCount() == 1);
664	>	lock.writeLock().lock();
665	>	assertTrue(lock.getWriteHoldCount() == 2);
666	>	lock.writeLock().unlock();
667	>	lock.writeLock().lock();
668	>	lock.writeLock().unlock();
669	>	lock.writeLock().unlock();
670	>	t1.join(MEDIUM_DELAY_MS);
671	>	t2.join(MEDIUM_DELAY_MS);
672	>	assertTrue(!t1.isAlive());
673	>	assertTrue(!t2.isAlive());
674	>
675	>	} catch(Exception e){
676	>	unexpectedException();
677	>	}
678	>	}
679
680
681		/**
682		* Read tryLock succeeds if readlocked but not writelocked
683		*/
684	<	public void testTryLockWhenReadLocked() {
684	>	public void testTryLockWhenReadLocked() {
685		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
686		lock.readLock().lock();
687		Thread t = new Thread(new Runnable() {
#	Line 396 | Line 697 | public class ReentrantReadWriteLockTest
697		} catch(Exception e){
698		unexpectedException();
699		}
700	<	}
700	>	}
701	>
702
401	–
703
704		/**
705		* write tryLock fails when readlocked
706		*/
707	<	public void testWriteTryLockWhenReadLocked() {
707	>	public void testWriteTryLockWhenReadLocked() {
708		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
709		lock.readLock().lock();
710		Thread t = new Thread(new Runnable() {
#	Line 418 | Line 719 | public class ReentrantReadWriteLockTest
719		} catch(Exception e){
720		unexpectedException();
721		}
722	<	}
722	>	}
723	>
724	>
725	>	/**
726	>	* Fair Read tryLock succeeds if readlocked but not writelocked
727	>	*/
728	>	public void testTryLockWhenReadLockedFair() {
729	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
730	>	lock.readLock().lock();
731	>	Thread t = new Thread(new Runnable() {
732	>	public void run() {
733	>	threadAssertTrue(lock.readLock().tryLock());
734	>	lock.readLock().unlock();
735	>	}
736	>	});
737	>	try {
738	>	t.start();
739	>	t.join();
740	>	lock.readLock().unlock();
741	>	} catch(Exception e){
742	>	unexpectedException();
743	>	}
744	>	}
745	>
746	>
747	>
748	>	/**
749	>	* Fair write tryLock fails when readlocked
750	>	*/
751	>	public void testWriteTryLockWhenReadLockedFair() {
752	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true);
753	>	lock.readLock().lock();
754	>	Thread t = new Thread(new Runnable() {
755	>	public void run() {
756	>	threadAssertFalse(lock.writeLock().tryLock());
757	>	}
758	>	});
759	>	try {
760	>	t.start();
761	>	t.join();
762	>	lock.readLock().unlock();
763	>	} catch(Exception e){
764	>	unexpectedException();
765	>	}
766	>	}
767	>
768
423	–
769
770		/**
771		* write timed tryLock times out if locked
772		*/
773	<	public void testWriteTryLock_Timeout() {
773	>	public void testWriteTryLock_Timeout() {
774		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
775		lock.writeLock().lock();
776		Thread t = new Thread(new Runnable() {
#	Line 444 | Line 789 | public class ReentrantReadWriteLockTest
789		} catch(Exception e){
790		unexpectedException();
791		}
792	<	}
792	>	}
793
794		/**
795		* read timed tryLock times out if write-locked
796		*/
797	<	public void testReadTryLock_Timeout() {
797	>	public void testReadTryLock_Timeout() {
798		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
799		lock.writeLock().lock();
800		Thread t = new Thread(new Runnable() {
#	Line 468 | Line 813 | public class ReentrantReadWriteLockTest
813		} catch(Exception e){
814		unexpectedException();
815		}
816	<	}
816	>	}
817
818
819		/**
#	Line 481 | Line 826 | public class ReentrantReadWriteLockTest
826		} catch(Exception e) {
827		unexpectedException();
828		}
829	<	Thread t = new Thread(new Runnable() {
829	>	Thread t = new Thread(new Runnable() {
830		public void run() {
831		try {
832		lock.writeLock().lockInterruptibly();
#	Line 493 | Line 838 | public class ReentrantReadWriteLockTest
838		});
839		try {
840		t.start();
841	+	Thread.sleep(SHORT_DELAY_MS);
842		t.interrupt();
843	+	Thread.sleep(SHORT_DELAY_MS);
844		t.join();
845		lock.writeLock().unlock();
846		} catch(Exception e){
#	Line 511 | Line 858 | public class ReentrantReadWriteLockTest
858		} catch(Exception e) {
859		unexpectedException();
860		}
861	<	Thread t = new Thread(new Runnable() {
861	>	Thread t = new Thread(new Runnable() {
862		public void run() {
863		try {
864		lock.readLock().lockInterruptibly();
#	Line 523 | Line 870 | public class ReentrantReadWriteLockTest
870		});
871		try {
872		t.start();
873	+	Thread.sleep(SHORT_DELAY_MS);
874		t.interrupt();
875		t.join();
876		lock.writeLock().unlock();
#	Line 535 | Line 883 | public class ReentrantReadWriteLockTest
883		* Calling await without holding lock throws IllegalMonitorStateException
884		*/
885		public void testAwait_IllegalMonitor() {
886	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
886	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
887		final Condition c = lock.writeLock().newCondition();
888		try {
889		c.await();
#	Line 552 | Line 900 | public class ReentrantReadWriteLockTest
900		* Calling signal without holding lock throws IllegalMonitorStateException
901		*/
902		public void testSignal_IllegalMonitor() {
903	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
903	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
904		final Condition c = lock.writeLock().newCondition();
905		try {
906		c.signal();
#	Line 569 | Line 917 | public class ReentrantReadWriteLockTest
917		* awaitNanos without a signal times out
918		*/
919		public void testAwaitNanos_Timeout() {
920	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
920	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
921		final Condition c = lock.writeLock().newCondition();
922		try {
923		lock.writeLock().lock();
#	Line 587 | Line 935 | public class ReentrantReadWriteLockTest
935		*  timed await without a signal times out
936		*/
937		public void testAwait_Timeout() {
938	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
938	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
939		final Condition c = lock.writeLock().newCondition();
940		try {
941		lock.writeLock().lock();
594	–	assertFalse(c.await(10, TimeUnit.MILLISECONDS));
942		lock.writeLock().unlock();
943		}
944		catch (Exception ex) {
#	Line 603 | Line 950 | public class ReentrantReadWriteLockTest
950		* awaitUntil without a signal times out
951		*/
952		public void testAwaitUntil_Timeout() {
953	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
953	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
954		final Condition c = lock.writeLock().newCondition();
955		try {
956		lock.writeLock().lock();
957		java.util.Date d = new java.util.Date();
611	–	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
958		lock.writeLock().unlock();
959		}
960		catch (Exception ex) {
#	Line 620 | Line 966 | public class ReentrantReadWriteLockTest
966		* await returns when signalled
967		*/
968		public void testAwait() {
969	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
969	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
970		final Condition c = lock.writeLock().newCondition();
971	<	Thread t = new Thread(new Runnable() {
971	>	Thread t = new Thread(new Runnable() {
972		public void run() {
973		try {
974		lock.writeLock().lock();
#	Line 649 | Line 995 | public class ReentrantReadWriteLockTest
995		}
996		}
997
998	+	/** A helper class for uninterruptible wait tests */
999	+	class UninterruptableThread extends Thread {
1000	+	private Lock lock;
1001	+	private Condition c;
1002	+
1003	+	public volatile boolean canAwake = false;
1004	+	public volatile boolean interrupted = false;
1005	+	public volatile boolean lockStarted = false;
1006	+
1007	+	public UninterruptableThread(Lock lock, Condition c) {
1008	+	this.lock = lock;
1009	+	this.c = c;
1010	+	}
1011	+
1012	+	public synchronized void run() {
1013	+	lock.lock();
1014	+	lockStarted = true;
1015	+
1016	+	while (!canAwake) {
1017	+	c.awaitUninterruptibly();
1018	+	}
1019	+
1020	+	interrupted = isInterrupted();
1021	+	lock.unlock();
1022	+	}
1023	+	}
1024	+
1025		/**
1026		* awaitUninterruptibly doesn't abort on interrupt
1027		*/
1028		public void testAwaitUninterruptibly() {
1029	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1029	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1030		final Condition c = lock.writeLock().newCondition();
1031	<	Thread t = new Thread(new Runnable() {
659	<	public void run() {
660	<	lock.writeLock().lock();
661	<	c.awaitUninterruptibly();
662	<	lock.writeLock().unlock();
663	<	}
664	<	});
1031	>	UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c);
1032
1033		try {
1034	<	t.start();
1035	<	Thread.sleep(SHORT_DELAY_MS);
1036	<	t.interrupt();
1034	>	thread.start();
1035	>
1036	>	while (!thread.lockStarted) {
1037	>	Thread.sleep(100);
1038	>	}
1039	>
1040		lock.writeLock().lock();
1041	<	c.signal();
1042	<	lock.writeLock().unlock();
1043	<	assert(t.isInterrupted());
1044	<	t.join(SHORT_DELAY_MS);
1045	<	assertFalse(t.isAlive());
1046	<	}
1047	<	catch (Exception ex) {
1041	>	try {
1042	>	thread.interrupt();
1043	>	thread.canAwake = true;
1044	>	c.signal();
1045	>	} finally {
1046	>	lock.writeLock().unlock();
1047	>	}
1048	>
1049	>	thread.join();
1050	>	assertTrue(thread.interrupted);
1051	>	assertFalse(thread.isAlive());
1052	>	} catch (Exception ex) {
1053		unexpectedException();
1054		}
1055		}
#	Line 683 | Line 1058 | public class ReentrantReadWriteLockTest
1058		* await is interruptible
1059		*/
1060		public void testAwait_Interrupt() {
1061	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1061	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1062		final Condition c = lock.writeLock().newCondition();
1063	<	Thread t = new Thread(new Runnable() {
1063	>	Thread t = new Thread(new Runnable() {
1064		public void run() {
1065		try {
1066		lock.writeLock().lock();
#	Line 714 | Line 1089 | public class ReentrantReadWriteLockTest
1089		* awaitNanos is interruptible
1090		*/
1091		public void testAwaitNanos_Interrupt() {
1092	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1092	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1093		final Condition c = lock.writeLock().newCondition();
1094	<	Thread t = new Thread(new Runnable() {
1094	>	Thread t = new Thread(new Runnable() {
1095		public void run() {
1096		try {
1097		lock.writeLock().lock();
#	Line 745 | Line 1120 | public class ReentrantReadWriteLockTest
1120		* awaitUntil is interruptible
1121		*/
1122		public void testAwaitUntil_Interrupt() {
1123	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1123	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1124		final Condition c = lock.writeLock().newCondition();
1125	<	Thread t = new Thread(new Runnable() {
1125	>	Thread t = new Thread(new Runnable() {
1126		public void run() {
1127		try {
1128		lock.writeLock().lock();
#	Line 777 | Line 1152 | public class ReentrantReadWriteLockTest
1152		* signalAll wakes up all threads
1153		*/
1154		public void testSignalAll() {
1155	<	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1155	>	final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1156		final Condition c = lock.writeLock().newCondition();
1157	<	Thread t1 = new Thread(new Runnable() {
1157	>	Thread t1 = new Thread(new Runnable() {
1158		public void run() {
1159		try {
1160		lock.writeLock().lock();
#	Line 792 | Line 1167 | public class ReentrantReadWriteLockTest
1167		}
1168		});
1169
1170	<	Thread t2 = new Thread(new Runnable() {
1170	>	Thread t2 = new Thread(new Runnable() {
1171		public void run() {
1172		try {
1173		lock.writeLock().lock();
#	Line 850 | Line 1225 | public class ReentrantReadWriteLockTest
1225		/**
1226		* hasQueuedThreads reports whether there are waiting threads
1227		*/
1228	<	public void testhasQueuedThreads() {
1228	>	public void testhasQueuedThreads() {
1229		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1230		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1231		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 874 | Line 1249 | public class ReentrantReadWriteLockTest
1249		} catch(Exception e){
1250		unexpectedException();
1251		}
1252	<	}
1252	>	}
1253
1254		/**
1255		* hasQueuedThread(null) throws NPE
1256		*/
1257	<	public void testHasQueuedThreadNPE() {
1257	>	public void testHasQueuedThreadNPE() {
1258		final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1259		try {
1260		sync.hasQueuedThread(null);
#	Line 891 | Line 1266 | public class ReentrantReadWriteLockTest
1266		/**
1267		* hasQueuedThread reports whether a thread is queued.
1268		*/
1269	<	public void testHasQueuedThread() {
1269	>	public void testHasQueuedThread() {
1270		final ReentrantReadWriteLock sync = new ReentrantReadWriteLock();
1271		Thread t1 = new Thread(new InterruptedLockRunnable(sync));
1272		Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
#	Line 920 | Line 1295 | public class ReentrantReadWriteLockTest
1295		} catch(Exception e){
1296		unexpectedException();
1297		}
1298	<	}
1298	>	}
1299
1300
1301		/**
1302		* getQueueLength reports number of waiting threads
1303		*/
1304	<	public void testGetQueueLength() {
1304	>	public void testGetQueueLength() {
1305		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1306		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1307		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 950 | Line 1325 | public class ReentrantReadWriteLockTest
1325		} catch(Exception e){
1326		unexpectedException();
1327		}
1328	<	}
1328	>	}
1329
1330		/**
1331		* getQueuedThreads includes waiting threads
1332		*/
1333	<	public void testGetQueuedThreads() {
1333	>	public void testGetQueuedThreads() {
1334		final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1335		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
1336		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 982 | Line 1357 | public class ReentrantReadWriteLockTest
1357		} catch(Exception e){
1358		unexpectedException();
1359		}
1360	<	}
1360	>	}
1361
1362		/**
1363		* hasWaiters throws NPE if null
#	Line 1095 | Line 1470 | public class ReentrantReadWriteLockTest
1470		* getWaitingThreads throws IAE if not owned
1471		*/
1472		public void testGetWaitingThreadsIAE() {
1473	<	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1473	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1474		final Condition c = (lock.writeLock().newCondition());
1475	<	final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1475	>	final PublicReentrantReadWriteLock lock2 = new PublicReentrantReadWriteLock();
1476		try {
1477		lock2.getWaitingThreads(c);
1478		shouldThrow();
#	Line 1111 | Line 1486 | public class ReentrantReadWriteLockTest
1486		* getWaitingThreads throws IMSE if not locked
1487		*/
1488		public void testGetWaitingThreadsIMSE() {
1489	<	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1489	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1490		final Condition c = (lock.writeLock().newCondition());
1491		try {
1492		lock.getWaitingThreads(c);
#	Line 1129 | Line 1504 | public class ReentrantReadWriteLockTest
1504		public void testHasWaiters() {
1505		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1506		final Condition c = (lock.writeLock().newCondition());
1507	<	Thread t = new Thread(new Runnable() {
1507	>	Thread t = new Thread(new Runnable() {
1508		public void run() {
1509		try {
1510		lock.writeLock().lock();
#	Line 1171 | Line 1546 | public class ReentrantReadWriteLockTest
1546		public void testGetWaitQueueLength() {
1547		final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
1548		final Condition c = (lock.writeLock().newCondition());
1549	<	Thread t = new Thread(new Runnable() {
1549	>	Thread t = new Thread(new Runnable() {
1550		public void run() {
1551		try {
1552		lock.writeLock().lock();
#	Line 1212 | Line 1587 | public class ReentrantReadWriteLockTest
1587		* getWaitingThreads returns only and all waiting threads
1588		*/
1589		public void testGetWaitingThreads() {
1590	<	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1590	>	final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock();
1591		final Condition c = lock.writeLock().newCondition();
1592	<	Thread t1 = new Thread(new Runnable() {
1592	>	Thread t1 = new Thread(new Runnable() {
1593		public void run() {
1594		try {
1595		lock.writeLock().lock();
#	Line 1228 | Line 1603 | public class ReentrantReadWriteLockTest
1603		}
1604		});
1605
1606	<	Thread t2 = new Thread(new Runnable() {
1606	>	Thread t2 = new Thread(new Runnable() {
1607		public void run() {
1608		try {
1609		lock.writeLock().lock();

Diff Legend

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