ViewVC Help

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

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

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.44 by jsr166, Sat May 7 03:40:45 2011 UTC vs.
Revision 1.66 by jsr166, Mon Jul 17 21:01:30 2017 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.concurrent.locks.*;
11	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
13	–	import java.util.*;
14	–	import java.io.*;
10
11	+	import java.util.Arrays;
12	+	import java.util.Collection;
13	+	import java.util.HashSet;
14	+	import java.util.concurrent.CountDownLatch;
15	+	import java.util.concurrent.CyclicBarrier;
16	+	import java.util.concurrent.locks.Condition;
17	+	import java.util.concurrent.locks.ReentrantLock;
18	+
19	+	import junit.framework.AssertionFailedError;
20	+	import junit.framework.Test;
21	+	import junit.framework.TestSuite;
22	+
23	+	@SuppressWarnings("WaitNotInLoop") // we implement spurious-wakeup freedom
24		public class ReentrantLockTest extends JSR166TestCase {
25		public static void main(String[] args) {
26	<	junit.textui.TestRunner.run(suite());
26	>	main(suite(), args);
27		}
28		public static Test suite() {
29		return new TestSuite(ReentrantLockTest.class);
30		}
31
32		/**
33	<	* A runnable calling lockInterruptibly
33	>	* A checked runnable calling lockInterruptibly
34		*/
35		class InterruptibleLockRunnable extends CheckedRunnable {
36		final ReentrantLock lock;
37	<	InterruptibleLockRunnable(ReentrantLock l) { lock = l; }
37	>	InterruptibleLockRunnable(ReentrantLock lock) { this.lock = lock; }
38		public void realRun() throws InterruptedException {
39		lock.lockInterruptibly();
40		}
41		}
42
35	–
43		/**
44	<	* A runnable calling lockInterruptibly that expects to be
44	>	* A checked runnable calling lockInterruptibly that expects to be
45		* interrupted
46		*/
47		class InterruptedLockRunnable extends CheckedInterruptedRunnable {
48		final ReentrantLock lock;
49	<	InterruptedLockRunnable(ReentrantLock l) { lock = l; }
49	>	InterruptedLockRunnable(ReentrantLock lock) { this.lock = lock; }
50		public void realRun() throws InterruptedException {
51		lock.lockInterruptibly();
52		}
#	Line 50 | Line 57 | public class ReentrantLockTest extends J
57		*/
58		static class PublicReentrantLock extends ReentrantLock {
59		PublicReentrantLock() { super(); }
60	+	PublicReentrantLock(boolean fair) { super(fair); }
61	+	public Thread getOwner() {
62	+	return super.getOwner();
63	+	}
64		public Collection<Thread> getQueuedThreads() {
65		return super.getQueuedThreads();
66		}
#	Line 59 | Line 70 | public class ReentrantLockTest extends J
70		}
71
72		/**
73	+	* Releases write lock, checking that it had a hold count of 1.
74	+	*/
75	+	void releaseLock(PublicReentrantLock lock) {
76	+	assertLockedByMoi(lock);
77	+	lock.unlock();
78	+	assertFalse(lock.isHeldByCurrentThread());
79	+	assertNotLocked(lock);
80	+	}
81	+
82	+	/**
83	+	* Spin-waits until lock.hasQueuedThread(t) becomes true.
84	+	*/
85	+	void waitForQueuedThread(PublicReentrantLock lock, Thread t) {
86	+	long startTime = System.nanoTime();
87	+	while (!lock.hasQueuedThread(t)) {
88	+	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
89	+	throw new AssertionFailedError("timed out");
90	+	Thread.yield();
91	+	}
92	+	assertTrue(t.isAlive());
93	+	assertNotSame(t, lock.getOwner());
94	+	}
95	+
96	+	/**
97	+	* Checks that lock is not locked.
98	+	*/
99	+	void assertNotLocked(PublicReentrantLock lock) {
100	+	assertFalse(lock.isLocked());
101	+	assertFalse(lock.isHeldByCurrentThread());
102	+	assertNull(lock.getOwner());
103	+	assertEquals(0, lock.getHoldCount());
104	+	}
105	+
106	+	/**
107	+	* Checks that lock is locked by the given thread.
108	+	*/
109	+	void assertLockedBy(PublicReentrantLock lock, Thread t) {
110	+	assertTrue(lock.isLocked());
111	+	assertSame(t, lock.getOwner());
112	+	assertEquals(t == Thread.currentThread(),
113	+	lock.isHeldByCurrentThread());
114	+	assertEquals(t == Thread.currentThread(),
115	+	lock.getHoldCount() > 0);
116	+	}
117	+
118	+	/**
119	+	* Checks that lock is locked by the current thread.
120	+	*/
121	+	void assertLockedByMoi(PublicReentrantLock lock) {
122	+	assertLockedBy(lock, Thread.currentThread());
123	+	}
124	+
125	+	/**
126		* Checks that condition c has no waiters.
127		*/
128		void assertHasNoWaiters(PublicReentrantLock lock, Condition c) {
#	Line 80 | Line 144 | public class ReentrantLockTest extends J
144		lock.unlock();
145		}
146
147	+	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
148	+
149		/**
150	<	* Constructor sets given fairness
150	>	* Awaits condition "indefinitely" using the specified AwaitMethod.
151		*/
152	<	public void testConstructor() {
153	<	assertFalse(new ReentrantLock().isFair());
154	<	assertFalse(new ReentrantLock(false).isFair());
155	<	assertTrue(new ReentrantLock(true).isFair());
152	>	void await(Condition c, AwaitMethod awaitMethod)
153	>	throws InterruptedException {
154	>	long timeoutMillis = 2 * LONG_DELAY_MS;
155	>	switch (awaitMethod) {
156	>	case await:
157	>	c.await();
158	>	break;
159	>	case awaitTimed:
160	>	assertTrue(c.await(timeoutMillis, MILLISECONDS));
161	>	break;
162	>	case awaitNanos:
163	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
164	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
165	>	assertTrue(nanosRemaining > timeoutNanos / 2);
166	>	assertTrue(nanosRemaining <= timeoutNanos);
167	>	break;
168	>	case awaitUntil:
169	>	assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
170	>	break;
171	>	default:
172	>	throw new AssertionError();
173	>	}
174		}
175
176		/**
177	<	* locking an unlocked lock succeeds
177	>	* Constructor sets given fairness, and is in unlocked state
178		*/
179	<	public void testLock() {
180	<	ReentrantLock rl = new ReentrantLock();
181	<	rl.lock();
182	<	assertTrue(rl.isLocked());
183	<	rl.unlock();
184	<	assertFalse(rl.isLocked());
179	>	public void testConstructor() {
180	>	PublicReentrantLock lock;
181	>
182	>	lock = new PublicReentrantLock();
183	>	assertFalse(lock.isFair());
184	>	assertNotLocked(lock);
185	>
186	>	lock = new PublicReentrantLock(true);
187	>	assertTrue(lock.isFair());
188	>	assertNotLocked(lock);
189	>
190	>	lock = new PublicReentrantLock(false);
191	>	assertFalse(lock.isFair());
192	>	assertNotLocked(lock);
193		}
194
195		/**
196	<	* locking an unlocked fair lock succeeds
197	<	*/
198	<	public void testFairLock() {
199	<	ReentrantLock rl = new ReentrantLock(true);
200	<	rl.lock();
201	<	assertTrue(rl.isLocked());
202	<	rl.unlock();
196	>	* locking an unlocked lock succeeds
197	>	*/
198	>	public void testLock()      { testLock(false); }
199	>	public void testLock_fair() { testLock(true); }
200	>	public void testLock(boolean fair) {
201	>	PublicReentrantLock lock = new PublicReentrantLock(fair);
202	>	lock.lock();
203	>	assertLockedByMoi(lock);
204	>	releaseLock(lock);
205		}
206
207		/**
208		* Unlocking an unlocked lock throws IllegalMonitorStateException
209		*/
210	<	public void testUnlock_IllegalMonitorStateException() {
211	<	ReentrantLock rl = new ReentrantLock();
210	>	public void testUnlock_IMSE()      { testUnlock_IMSE(false); }
211	>	public void testUnlock_IMSE_fair() { testUnlock_IMSE(true); }
212	>	public void testUnlock_IMSE(boolean fair) {
213	>	final ReentrantLock lock = new ReentrantLock(fair);
214		try {
215	<	rl.unlock();
215	>	lock.unlock();
216		shouldThrow();
217		} catch (IllegalMonitorStateException success) {}
218		}
#	Line 124 | Line 220 | public class ReentrantLockTest extends J
220		/**
221		* tryLock on an unlocked lock succeeds
222		*/
223	<	public void testTryLock() {
224	<	ReentrantLock rl = new ReentrantLock();
225	<	assertTrue(rl.tryLock());
226	<	assertTrue(rl.isLocked());
227	<	rl.unlock();
223	>	public void testTryLock()      { testTryLock(false); }
224	>	public void testTryLock_fair() { testTryLock(true); }
225	>	public void testTryLock(boolean fair) {
226	>	PublicReentrantLock lock = new PublicReentrantLock(fair);
227	>	assertTrue(lock.tryLock());
228	>	assertLockedByMoi(lock);
229	>	assertTrue(lock.tryLock());
230	>	assertLockedByMoi(lock);
231	>	lock.unlock();
232	>	releaseLock(lock);
233		}
234
134	–
235		/**
236		* hasQueuedThreads reports whether there are waiting threads
237		*/
238	<	public void testhasQueuedThreads() throws InterruptedException {
239	<	final ReentrantLock lock = new ReentrantLock();
238	>	public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
239	>	public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
240	>	public void testHasQueuedThreads(boolean fair) {
241	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
242		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
243		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
244		assertFalse(lock.hasQueuedThreads());
245		lock.lock();
246	+	assertFalse(lock.hasQueuedThreads());
247		t1.start();
248	<	delay(SHORT_DELAY_MS);
248	>	waitForQueuedThread(lock, t1);
249		assertTrue(lock.hasQueuedThreads());
250		t2.start();
251	<	delay(SHORT_DELAY_MS);
251	>	waitForQueuedThread(lock, t2);
252		assertTrue(lock.hasQueuedThreads());
253		t1.interrupt();
254	<	delay(SHORT_DELAY_MS);
254	>	awaitTermination(t1);
255		assertTrue(lock.hasQueuedThreads());
256		lock.unlock();
154	–	delay(SHORT_DELAY_MS);
155	–	assertFalse(lock.hasQueuedThreads());
156	–	awaitTermination(t1);
257		awaitTermination(t2);
258	+	assertFalse(lock.hasQueuedThreads());
259		}
260
261		/**
262		* getQueueLength reports number of waiting threads
263		*/
264	<	public void testGetQueueLength() throws InterruptedException {
265	<	final ReentrantLock lock = new ReentrantLock();
264	>	public void testGetQueueLength()      { testGetQueueLength(false); }
265	>	public void testGetQueueLength_fair() { testGetQueueLength(true); }
266	>	public void testGetQueueLength(boolean fair) {
267	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
268		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
269		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
270		assertEquals(0, lock.getQueueLength());
271		lock.lock();
272		t1.start();
273	<	delay(SHORT_DELAY_MS);
273	>	waitForQueuedThread(lock, t1);
274		assertEquals(1, lock.getQueueLength());
275		t2.start();
276	<	delay(SHORT_DELAY_MS);
276	>	waitForQueuedThread(lock, t2);
277		assertEquals(2, lock.getQueueLength());
278		t1.interrupt();
176	–	delay(SHORT_DELAY_MS);
177	–	assertEquals(1, lock.getQueueLength());
178	–	lock.unlock();
179	–	delay(SHORT_DELAY_MS);
180	–	assertEquals(0, lock.getQueueLength());
279		awaitTermination(t1);
182	–	awaitTermination(t2);
183	–	}
184	–
185	–	/**
186	–	* getQueueLength reports number of waiting threads
187	–	*/
188	–	public void testGetQueueLength_fair() throws InterruptedException {
189	–	final ReentrantLock lock = new ReentrantLock(true);
190	–	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
191	–	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
192	–	assertEquals(0, lock.getQueueLength());
193	–	lock.lock();
194	–	t1.start();
195	–	delay(SHORT_DELAY_MS);
196	–	assertEquals(1, lock.getQueueLength());
197	–	t2.start();
198	–	delay(SHORT_DELAY_MS);
199	–	assertEquals(2, lock.getQueueLength());
200	–	t1.interrupt();
201	–	delay(SHORT_DELAY_MS);
280		assertEquals(1, lock.getQueueLength());
281		lock.unlock();
204	–	delay(SHORT_DELAY_MS);
205	–	assertEquals(0, lock.getQueueLength());
206	–	awaitTermination(t1);
282		awaitTermination(t2);
283	+	assertEquals(0, lock.getQueueLength());
284		}
285
286		/**
287		* hasQueuedThread(null) throws NPE
288		*/
289	<	public void testHasQueuedThreadNPE() {
290	<	final ReentrantLock sync = new ReentrantLock();
289	>	public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
290	>	public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
291	>	public void testHasQueuedThreadNPE(boolean fair) {
292	>	final ReentrantLock lock = new ReentrantLock(fair);
293		try {
294	<	sync.hasQueuedThread(null);
294	>	lock.hasQueuedThread(null);
295		shouldThrow();
296		} catch (NullPointerException success) {}
297		}
298
299		/**
300	<	* hasQueuedThread reports whether a thread is queued.
300	>	* hasQueuedThread reports whether a thread is queued
301		*/
302	<	public void testHasQueuedThread() throws InterruptedException {
303	<	final ReentrantLock sync = new ReentrantLock();
304	<	Thread t1 = new Thread(new InterruptedLockRunnable(sync));
305	<	Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
306	<	assertFalse(sync.hasQueuedThread(t1));
307	<	assertFalse(sync.hasQueuedThread(t2));
308	<	sync.lock();
302	>	public void testHasQueuedThread()      { testHasQueuedThread(false); }
303	>	public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
304	>	public void testHasQueuedThread(boolean fair) {
305	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
306	>	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
307	>	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
308	>	assertFalse(lock.hasQueuedThread(t1));
309	>	assertFalse(lock.hasQueuedThread(t2));
310	>	lock.lock();
311		t1.start();
312	<	delay(SHORT_DELAY_MS);
313	<	assertTrue(sync.hasQueuedThread(t1));
312	>	waitForQueuedThread(lock, t1);
313	>	assertTrue(lock.hasQueuedThread(t1));
314	>	assertFalse(lock.hasQueuedThread(t2));
315		t2.start();
316	<	delay(SHORT_DELAY_MS);
317	<	assertTrue(sync.hasQueuedThread(t1));
318	<	assertTrue(sync.hasQueuedThread(t2));
316	>	waitForQueuedThread(lock, t2);
317	>	assertTrue(lock.hasQueuedThread(t1));
318	>	assertTrue(lock.hasQueuedThread(t2));
319		t1.interrupt();
239	–	delay(SHORT_DELAY_MS);
240	–	assertFalse(sync.hasQueuedThread(t1));
241	–	assertTrue(sync.hasQueuedThread(t2));
242	–	sync.unlock();
243	–	delay(SHORT_DELAY_MS);
244	–	assertFalse(sync.hasQueuedThread(t1));
245	–	delay(SHORT_DELAY_MS);
246	–	assertFalse(sync.hasQueuedThread(t2));
320		awaitTermination(t1);
321	+	assertFalse(lock.hasQueuedThread(t1));
322	+	assertTrue(lock.hasQueuedThread(t2));
323	+	lock.unlock();
324		awaitTermination(t2);
325	+	assertFalse(lock.hasQueuedThread(t1));
326	+	assertFalse(lock.hasQueuedThread(t2));
327		}
328
251	–
329		/**
330		* getQueuedThreads includes waiting threads
331		*/
332	<	public void testGetQueuedThreads() throws InterruptedException {
333	<	final PublicReentrantLock lock = new PublicReentrantLock();
332	>	public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
333	>	public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
334	>	public void testGetQueuedThreads(boolean fair) {
335	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
336		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
337		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
338		assertTrue(lock.getQueuedThreads().isEmpty());
339		lock.lock();
340		assertTrue(lock.getQueuedThreads().isEmpty());
341		t1.start();
342	<	delay(SHORT_DELAY_MS);
342	>	waitForQueuedThread(lock, t1);
343	>	assertEquals(1, lock.getQueuedThreads().size());
344		assertTrue(lock.getQueuedThreads().contains(t1));
345		t2.start();
346	<	delay(SHORT_DELAY_MS);
346	>	waitForQueuedThread(lock, t2);
347	>	assertEquals(2, lock.getQueuedThreads().size());
348		assertTrue(lock.getQueuedThreads().contains(t1));
349		assertTrue(lock.getQueuedThreads().contains(t2));
350		t1.interrupt();
351	<	delay(SHORT_DELAY_MS);
351	>	awaitTermination(t1);
352		assertFalse(lock.getQueuedThreads().contains(t1));
353		assertTrue(lock.getQueuedThreads().contains(t2));
354	+	assertEquals(1, lock.getQueuedThreads().size());
355		lock.unlock();
274	–	delay(SHORT_DELAY_MS);
275	–	assertTrue(lock.getQueuedThreads().isEmpty());
276	–	awaitTermination(t1);
356		awaitTermination(t2);
357	+	assertTrue(lock.getQueuedThreads().isEmpty());
358		}
359
280	–
360		/**
361	<	* timed tryLock is interruptible.
361	>	* timed tryLock is interruptible
362		*/
363	<	public void testInterruptedException2() throws InterruptedException {
364	<	final ReentrantLock lock = new ReentrantLock();
363	>	public void testTryLock_Interruptible()      { testTryLock_Interruptible(false); }
364	>	public void testTryLock_Interruptible_fair() { testTryLock_Interruptible(true); }
365	>	public void testTryLock_Interruptible(boolean fair) {
366	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
367		lock.lock();
368		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
369		public void realRun() throws InterruptedException {
370	<	lock.tryLock(MEDIUM_DELAY_MS,MILLISECONDS);
370	>	lock.tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
371		}});
372
373	<	delay(SHORT_DELAY_MS);
373	>	waitForQueuedThread(lock, t);
374		t.interrupt();
375		awaitTermination(t);
376	+	releaseLock(lock);
377		}
378
297	–
379		/**
380	<	* TryLock on a locked lock fails
380	>	* tryLock on a locked lock fails
381		*/
382	<	public void testTryLockWhenLocked() throws InterruptedException {
383	<	final ReentrantLock lock = new ReentrantLock();
382	>	public void testTryLockWhenLocked()      { testTryLockWhenLocked(false); }
383	>	public void testTryLockWhenLocked_fair() { testTryLockWhenLocked(true); }
384	>	public void testTryLockWhenLocked(boolean fair) {
385	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
386		lock.lock();
387		Thread t = newStartedThread(new CheckedRunnable() {
388		public void realRun() {
#	Line 307 | Line 390 | public class ReentrantLockTest extends J
390		}});
391
392		awaitTermination(t);
393	<	lock.unlock();
393	>	releaseLock(lock);
394		}
395
396		/**
397		* Timed tryLock on a locked lock times out
398		*/
399	<	public void testTryLock_Timeout() throws InterruptedException {
400	<	final ReentrantLock lock = new ReentrantLock();
399	>	public void testTryLock_Timeout()      { testTryLock_Timeout(false); }
400	>	public void testTryLock_Timeout_fair() { testTryLock_Timeout(true); }
401	>	public void testTryLock_Timeout(boolean fair) {
402	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
403	>	final long timeoutMillis = timeoutMillis();
404		lock.lock();
405		Thread t = newStartedThread(new CheckedRunnable() {
406		public void realRun() throws InterruptedException {
407	<	assertFalse(lock.tryLock(1, MILLISECONDS));
407	>	long startTime = System.nanoTime();
408	>	assertFalse(lock.tryLock(timeoutMillis, MILLISECONDS));
409	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
410		}});
411
412		awaitTermination(t);
413	<	lock.unlock();
413	>	releaseLock(lock);
414		}
415
416		/**
417		* getHoldCount returns number of recursive holds
418		*/
419	<	public void testGetHoldCount() {
420	<	ReentrantLock lock = new ReentrantLock();
419	>	public void testGetHoldCount()      { testGetHoldCount(false); }
420	>	public void testGetHoldCount_fair() { testGetHoldCount(true); }
421	>	public void testGetHoldCount(boolean fair) {
422	>	final ReentrantLock lock = new ReentrantLock(fair);
423		for (int i = 1; i <= SIZE; i++) {
424		lock.lock();
425		assertEquals(i, lock.getHoldCount());
426		}
427		for (int i = SIZE; i > 0; i--) {
428		lock.unlock();
429	<	assertEquals(i-1, lock.getHoldCount());
429	>	assertEquals(i - 1, lock.getHoldCount());
430		}
431		}
432
343	–
433		/**
434		* isLocked is true when locked and false when not
435		*/
436	<	public void testIsLocked() throws InterruptedException {
437	<	final ReentrantLock lock = new ReentrantLock();
438	<	lock.lock();
439	<	assertTrue(lock.isLocked());
440	<	lock.unlock();
441	<	assertFalse(lock.isLocked());
442	<	Thread t = newStartedThread(new CheckedRunnable() {
443	<	public void realRun() throws InterruptedException {
444	<	lock.lock();
445	<	delay(SMALL_DELAY_MS);
446	<	lock.unlock();
447	<	}});
448	<
449	<	delay(SHORT_DELAY_MS);
450	<	assertTrue(lock.isLocked());
451	<	awaitTermination(t);
452	<	assertFalse(lock.isLocked());
453	<	}
454	<
455	<
456	<	/**
457	<	* lockInterruptibly is interruptible.
458	<	*/
459	<	public void testLockInterruptibly1() throws InterruptedException {
460	<	final ReentrantLock lock = new ReentrantLock();
461	<	lock.lock();
462	<	Thread t = newStartedThread(new InterruptedLockRunnable(lock));
463	<	delay(SHORT_DELAY_MS);
464	<	t.interrupt();
465	<	delay(SHORT_DELAY_MS);
377	<	lock.unlock();
378	<	awaitTermination(t);
436	>	public void testIsLocked()      { testIsLocked(false); }
437	>	public void testIsLocked_fair() { testIsLocked(true); }
438	>	public void testIsLocked(boolean fair) {
439	>	final ReentrantLock lock = new ReentrantLock(fair);
440	>	try {
441	>	assertFalse(lock.isLocked());
442	>	lock.lock();
443	>	assertTrue(lock.isLocked());
444	>	lock.lock();
445	>	assertTrue(lock.isLocked());
446	>	lock.unlock();
447	>	assertTrue(lock.isLocked());
448	>	lock.unlock();
449	>	assertFalse(lock.isLocked());
450	>	final CyclicBarrier barrier = new CyclicBarrier(2);
451	>	Thread t = newStartedThread(new CheckedRunnable() {
452	>	public void realRun() throws Exception {
453	>	lock.lock();
454	>	assertTrue(lock.isLocked());
455	>	barrier.await();
456	>	barrier.await();
457	>	lock.unlock();
458	>	}});
459	>
460	>	barrier.await();
461	>	assertTrue(lock.isLocked());
462	>	barrier.await();
463	>	awaitTermination(t);
464	>	assertFalse(lock.isLocked());
465	>	} catch (Exception fail) { threadUnexpectedException(fail); }
466		}
467
468		/**
469		* lockInterruptibly succeeds when unlocked, else is interruptible
470		*/
471	<	public void testLockInterruptibly2() throws InterruptedException {
472	<	final ReentrantLock lock = new ReentrantLock();
473	<	lock.lockInterruptibly();
471	>	public void testLockInterruptibly()      { testLockInterruptibly(false); }
472	>	public void testLockInterruptibly_fair() { testLockInterruptibly(true); }
473	>	public void testLockInterruptibly(boolean fair) {
474	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
475	>	try {
476	>	lock.lockInterruptibly();
477	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
478	>	assertLockedByMoi(lock);
479		Thread t = newStartedThread(new InterruptedLockRunnable(lock));
480	<	delay(SHORT_DELAY_MS);
480	>	waitForQueuedThread(lock, t);
481		t.interrupt();
482		assertTrue(lock.isLocked());
483		assertTrue(lock.isHeldByCurrentThread());
484		awaitTermination(t);
485	+	releaseLock(lock);
486		}
487
488		/**
489		* Calling await without holding lock throws IllegalMonitorStateException
490		*/
491	<	public void testAwait_IllegalMonitor() throws InterruptedException {
492	<	final ReentrantLock lock = new ReentrantLock();
493	<	final Condition c = lock.newCondition();
494	<	try {
495	<	c.await();
496	<	shouldThrow();
497	<	} catch (IllegalMonitorStateException success) {}
491	>	public void testAwait_IMSE()      { testAwait_IMSE(false); }
492	>	public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
493	>	public void testAwait_IMSE(boolean fair) {
494	>	final ReentrantLock lock = new ReentrantLock(fair);
495	>	final Condition c = lock.newCondition();
496	>	for (AwaitMethod awaitMethod : AwaitMethod.values()) {
497	>	long startTime = System.nanoTime();
498	>	try {
499	>	await(c, awaitMethod);
500	>	shouldThrow();
501	>	} catch (IllegalMonitorStateException success) {
502	>	} catch (InterruptedException e) { threadUnexpectedException(e); }
503	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
504	>	}
505		}
506
507		/**
508		* Calling signal without holding lock throws IllegalMonitorStateException
509		*/
510	<	public void testSignal_IllegalMonitor() {
511	<	final ReentrantLock lock = new ReentrantLock();
510	>	public void testSignal_IMSE()      { testSignal_IMSE(false); }
511	>	public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
512	>	public void testSignal_IMSE(boolean fair) {
513	>	final ReentrantLock lock = new ReentrantLock(fair);
514		final Condition c = lock.newCondition();
515		try {
516		c.signal();
#	Line 419 | Line 521 | public class ReentrantLockTest extends J
521		/**
522		* awaitNanos without a signal times out
523		*/
524	<	public void testAwaitNanos_Timeout() throws InterruptedException {
525	<	final ReentrantLock lock = new ReentrantLock();
524	>	public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
525	>	public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
526	>	public void testAwaitNanos_Timeout(boolean fair) {
527	>	final ReentrantLock lock = new ReentrantLock(fair);
528		final Condition c = lock.newCondition();
529	+	final long timeoutMillis = timeoutMillis();
530	+	final long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
531		lock.lock();
532	<	long t = c.awaitNanos(100);
533	<	assertTrue(t <= 0);
532	>	final long startTime = System.nanoTime();
533	>	try {
534	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
535	>	assertTrue(nanosRemaining <= 0);
536	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
537	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
538		lock.unlock();
539		}
540
541		/**
542		* timed await without a signal times out
543		*/
544	<	public void testAwait_Timeout() throws InterruptedException {
545	<	final ReentrantLock lock = new ReentrantLock();
544	>	public void testAwait_Timeout()      { testAwait_Timeout(false); }
545	>	public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
546	>	public void testAwait_Timeout(boolean fair) {
547	>	final ReentrantLock lock = new ReentrantLock(fair);
548		final Condition c = lock.newCondition();
549	+	final long timeoutMillis = timeoutMillis();
550		lock.lock();
551	<	assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
551	>	final long startTime = System.nanoTime();
552	>	try {
553	>	assertFalse(c.await(timeoutMillis, MILLISECONDS));
554	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
555	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
556		lock.unlock();
557		}
558
559		/**
560		* awaitUntil without a signal times out
561		*/
562	<	public void testAwaitUntil_Timeout() throws InterruptedException {
563	<	final ReentrantLock lock = new ReentrantLock();
562	>	public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
563	>	public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
564	>	public void testAwaitUntil_Timeout(boolean fair) {
565	>	final ReentrantLock lock = new ReentrantLock(fair);
566		final Condition c = lock.newCondition();
567		lock.lock();
568	<	java.util.Date d = new java.util.Date();
569	<	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
568	>	// We shouldn't assume that nanoTime and currentTimeMillis
569	>	// use the same time source, so don't use nanoTime here.
570	>	final java.util.Date delayedDate = delayedDate(timeoutMillis());
571	>	try {
572	>	assertFalse(c.awaitUntil(delayedDate));
573	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
574	>	assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
575		lock.unlock();
576		}
577
578		/**
579		* await returns when signalled
580		*/
581	<	public void testAwait() throws InterruptedException {
582	<	final ReentrantLock lock = new ReentrantLock();
581	>	public void testAwait()      { testAwait(false); }
582	>	public void testAwait_fair() { testAwait(true); }
583	>	public void testAwait(boolean fair) {
584	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
585		final Condition c = lock.newCondition();
586	+	final CountDownLatch locked = new CountDownLatch(1);
587		Thread t = newStartedThread(new CheckedRunnable() {
588		public void realRun() throws InterruptedException {
589		lock.lock();
590	+	locked.countDown();
591		c.await();
592		lock.unlock();
593		}});
594
595	<	delay(SHORT_DELAY_MS);
595	>	await(locked);
596		lock.lock();
597	+	assertHasWaiters(lock, c, t);
598		c.signal();
599	+	assertHasNoWaiters(lock, c);
600	+	assertTrue(t.isAlive());
601		lock.unlock();
602		awaitTermination(t);
603		}
#	Line 474 | Line 605 | public class ReentrantLockTest extends J
605		/**
606		* hasWaiters throws NPE if null
607		*/
608	<	public void testHasWaitersNPE() {
609	<	final ReentrantLock lock = new ReentrantLock();
608	>	public void testHasWaitersNPE()      { testHasWaitersNPE(false); }
609	>	public void testHasWaitersNPE_fair() { testHasWaitersNPE(true); }
610	>	public void testHasWaitersNPE(boolean fair) {
611	>	final ReentrantLock lock = new ReentrantLock(fair);
612		try {
613		lock.hasWaiters(null);
614		shouldThrow();
#	Line 485 | Line 618 | public class ReentrantLockTest extends J
618		/**
619		* getWaitQueueLength throws NPE if null
620		*/
621	<	public void testGetWaitQueueLengthNPE() {
622	<	final ReentrantLock lock = new ReentrantLock();
621	>	public void testGetWaitQueueLengthNPE()      { testGetWaitQueueLengthNPE(false); }
622	>	public void testGetWaitQueueLengthNPE_fair() { testGetWaitQueueLengthNPE(true); }
623	>	public void testGetWaitQueueLengthNPE(boolean fair) {
624	>	final ReentrantLock lock = new ReentrantLock(fair);
625		try {
626		lock.getWaitQueueLength(null);
627		shouldThrow();
628		} catch (NullPointerException success) {}
629		}
630
496	–
631		/**
632		* getWaitingThreads throws NPE if null
633		*/
634	<	public void testGetWaitingThreadsNPE() {
635	<	final PublicReentrantLock lock = new PublicReentrantLock();
634	>	public void testGetWaitingThreadsNPE()      { testGetWaitingThreadsNPE(false); }
635	>	public void testGetWaitingThreadsNPE_fair() { testGetWaitingThreadsNPE(true); }
636	>	public void testGetWaitingThreadsNPE(boolean fair) {
637	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
638		try {
639		lock.getWaitingThreads(null);
640		shouldThrow();
641		} catch (NullPointerException success) {}
642		}
643
508	–
644		/**
645	<	* hasWaiters throws IAE if not owned
645	>	* hasWaiters throws IllegalArgumentException if not owned
646		*/
647	<	public void testHasWaitersIAE() {
648	<	final ReentrantLock lock = new ReentrantLock();
647	>	public void testHasWaitersIAE()      { testHasWaitersIAE(false); }
648	>	public void testHasWaitersIAE_fair() { testHasWaitersIAE(true); }
649	>	public void testHasWaitersIAE(boolean fair) {
650	>	final ReentrantLock lock = new ReentrantLock(fair);
651		final Condition c = lock.newCondition();
652	<	final ReentrantLock lock2 = new ReentrantLock();
652	>	final ReentrantLock lock2 = new ReentrantLock(fair);
653		try {
654		lock2.hasWaiters(c);
655		shouldThrow();
#	Line 520 | Line 657 | public class ReentrantLockTest extends J
657		}
658
659		/**
660	<	* hasWaiters throws IMSE if not locked
660	>	* hasWaiters throws IllegalMonitorStateException if not locked
661		*/
662	<	public void testHasWaitersIMSE() {
663	<	final ReentrantLock lock = new ReentrantLock();
662	>	public void testHasWaitersIMSE()      { testHasWaitersIMSE(false); }
663	>	public void testHasWaitersIMSE_fair() { testHasWaitersIMSE(true); }
664	>	public void testHasWaitersIMSE(boolean fair) {
665	>	final ReentrantLock lock = new ReentrantLock(fair);
666		final Condition c = lock.newCondition();
667		try {
668		lock.hasWaiters(c);
#	Line 531 | Line 670 | public class ReentrantLockTest extends J
670		} catch (IllegalMonitorStateException success) {}
671		}
672
534	–
673		/**
674	<	* getWaitQueueLength throws IAE if not owned
674	>	* getWaitQueueLength throws IllegalArgumentException if not owned
675		*/
676	<	public void testGetWaitQueueLengthIAE() {
677	<	final ReentrantLock lock = new ReentrantLock();
676	>	public void testGetWaitQueueLengthIAE()      { testGetWaitQueueLengthIAE(false); }
677	>	public void testGetWaitQueueLengthIAE_fair() { testGetWaitQueueLengthIAE(true); }
678	>	public void testGetWaitQueueLengthIAE(boolean fair) {
679	>	final ReentrantLock lock = new ReentrantLock(fair);
680		final Condition c = lock.newCondition();
681	<	final ReentrantLock lock2 = new ReentrantLock();
681	>	final ReentrantLock lock2 = new ReentrantLock(fair);
682		try {
683		lock2.getWaitQueueLength(c);
684		shouldThrow();
#	Line 546 | Line 686 | public class ReentrantLockTest extends J
686		}
687
688		/**
689	<	* getWaitQueueLength throws IMSE if not locked
689	>	* getWaitQueueLength throws IllegalMonitorStateException if not locked
690		*/
691	<	public void testGetWaitQueueLengthIMSE() {
692	<	final ReentrantLock lock = new ReentrantLock();
691	>	public void testGetWaitQueueLengthIMSE()      { testGetWaitQueueLengthIMSE(false); }
692	>	public void testGetWaitQueueLengthIMSE_fair() { testGetWaitQueueLengthIMSE(true); }
693	>	public void testGetWaitQueueLengthIMSE(boolean fair) {
694	>	final ReentrantLock lock = new ReentrantLock(fair);
695		final Condition c = lock.newCondition();
696		try {
697		lock.getWaitQueueLength(c);
#	Line 557 | Line 699 | public class ReentrantLockTest extends J
699		} catch (IllegalMonitorStateException success) {}
700		}
701
560	–
702		/**
703	<	* getWaitingThreads throws IAE if not owned
703	>	* getWaitingThreads throws IllegalArgumentException if not owned
704		*/
705	<	public void testGetWaitingThreadsIAE() {
706	<	final PublicReentrantLock lock = new PublicReentrantLock();
705	>	public void testGetWaitingThreadsIAE()      { testGetWaitingThreadsIAE(false); }
706	>	public void testGetWaitingThreadsIAE_fair() { testGetWaitingThreadsIAE(true); }
707	>	public void testGetWaitingThreadsIAE(boolean fair) {
708	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
709		final Condition c = lock.newCondition();
710	<	final PublicReentrantLock lock2 = new PublicReentrantLock();
710	>	final PublicReentrantLock lock2 = new PublicReentrantLock(fair);
711		try {
712		lock2.getWaitingThreads(c);
713		shouldThrow();
#	Line 572 | Line 715 | public class ReentrantLockTest extends J
715		}
716
717		/**
718	<	* getWaitingThreads throws IMSE if not locked
718	>	* getWaitingThreads throws IllegalMonitorStateException if not locked
719		*/
720	<	public void testGetWaitingThreadsIMSE() {
721	<	final PublicReentrantLock lock = new PublicReentrantLock();
720	>	public void testGetWaitingThreadsIMSE()      { testGetWaitingThreadsIMSE(false); }
721	>	public void testGetWaitingThreadsIMSE_fair() { testGetWaitingThreadsIMSE(true); }
722	>	public void testGetWaitingThreadsIMSE(boolean fair) {
723	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
724		final Condition c = lock.newCondition();
725		try {
726		lock.getWaitingThreads(c);
#	Line 583 | Line 728 | public class ReentrantLockTest extends J
728		} catch (IllegalMonitorStateException success) {}
729		}
730
586	–
731		/**
732		* hasWaiters returns true when a thread is waiting, else false
733		*/
734	<	public void testHasWaiters() throws InterruptedException {
735	<	final ReentrantLock lock = new ReentrantLock();
734	>	public void testHasWaiters()      { testHasWaiters(false); }
735	>	public void testHasWaiters_fair() { testHasWaiters(true); }
736	>	public void testHasWaiters(boolean fair) {
737	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
738		final Condition c = lock.newCondition();
739	+	final CountDownLatch pleaseSignal = new CountDownLatch(1);
740		Thread t = newStartedThread(new CheckedRunnable() {
741		public void realRun() throws InterruptedException {
742		lock.lock();
743	+	assertHasNoWaiters(lock, c);
744		assertFalse(lock.hasWaiters(c));
745	<	assertEquals(0, lock.getWaitQueueLength(c));
745	>	pleaseSignal.countDown();
746		c.await();
747	+	assertHasNoWaiters(lock, c);
748	+	assertFalse(lock.hasWaiters(c));
749		lock.unlock();
750		}});
751
752	<	delay(SHORT_DELAY_MS);
752	>	await(pleaseSignal);
753		lock.lock();
754	+	assertHasWaiters(lock, c, t);
755		assertTrue(lock.hasWaiters(c));
605	–	assertEquals(1, lock.getWaitQueueLength(c));
756		c.signal();
757	<	lock.unlock();
608	<	delay(SHORT_DELAY_MS);
609	<	lock.lock();
757	>	assertHasNoWaiters(lock, c);
758		assertFalse(lock.hasWaiters(c));
611	–	assertEquals(0, lock.getWaitQueueLength(c));
759		lock.unlock();
760		awaitTermination(t);
761	+	assertHasNoWaiters(lock, c);
762		}
763
764		/**
765		* getWaitQueueLength returns number of waiting threads
766		*/
767	<	public void testGetWaitQueueLength() throws InterruptedException {
768	<	final ReentrantLock lock = new ReentrantLock();
767	>	public void testGetWaitQueueLength()      { testGetWaitQueueLength(false); }
768	>	public void testGetWaitQueueLength_fair() { testGetWaitQueueLength(true); }
769	>	public void testGetWaitQueueLength(boolean fair) {
770	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
771		final Condition c = lock.newCondition();
772	<	Thread t1 = newStartedThread(new CheckedRunnable() {
772	>	final CountDownLatch locked1 = new CountDownLatch(1);
773	>	final CountDownLatch locked2 = new CountDownLatch(1);
774	>	Thread t1 = new Thread(new CheckedRunnable() {
775		public void realRun() throws InterruptedException {
776		lock.lock();
777		assertFalse(lock.hasWaiters(c));
778		assertEquals(0, lock.getWaitQueueLength(c));
779	+	locked1.countDown();
780		c.await();
781		lock.unlock();
782		}});
783
784	<	delay(SHORT_DELAY_MS);
632	<
633	<	Thread t2 = newStartedThread(new CheckedRunnable() {
784	>	Thread t2 = new Thread(new CheckedRunnable() {
785		public void realRun() throws InterruptedException {
786		lock.lock();
787		assertTrue(lock.hasWaiters(c));
788		assertEquals(1, lock.getWaitQueueLength(c));
789	+	locked2.countDown();
790		c.await();
791		lock.unlock();
792		}});
793
642	–	delay(SHORT_DELAY_MS);
794		lock.lock();
795	<	assertTrue(lock.hasWaiters(c));
645	<	assertEquals(2, lock.getWaitQueueLength(c));
646	<	c.signalAll();
795	>	assertEquals(0, lock.getWaitQueueLength(c));
796		lock.unlock();
797	<	delay(SHORT_DELAY_MS);
797	>
798	>	t1.start();
799	>	await(locked1);
800	>
801		lock.lock();
802	<	assertFalse(lock.hasWaiters(c));
803	<	assertEquals(0, lock.getWaitQueueLength(c));
802	>	assertHasWaiters(lock, c, t1);
803	>	assertEquals(1, lock.getWaitQueueLength(c));
804		lock.unlock();
805	+
806	+	t2.start();
807	+	await(locked2);
808	+
809	+	lock.lock();
810	+	assertHasWaiters(lock, c, t1, t2);
811	+	assertEquals(2, lock.getWaitQueueLength(c));
812	+	c.signalAll();
813	+	assertHasNoWaiters(lock, c);
814	+	lock.unlock();
815	+
816		awaitTermination(t1);
817		awaitTermination(t2);
818	+
819	+	assertHasNoWaiters(lock, c);
820		}
821
822		/**
823		* getWaitingThreads returns only and all waiting threads
824		*/
825	<	public void testGetWaitingThreads() throws InterruptedException {
826	<	final PublicReentrantLock lock = new PublicReentrantLock();
825	>	public void testGetWaitingThreads()      { testGetWaitingThreads(false); }
826	>	public void testGetWaitingThreads_fair() { testGetWaitingThreads(true); }
827	>	public void testGetWaitingThreads(boolean fair) {
828	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
829		final Condition c = lock.newCondition();
830	+	final CountDownLatch locked1 = new CountDownLatch(1);
831	+	final CountDownLatch locked2 = new CountDownLatch(1);
832		Thread t1 = new Thread(new CheckedRunnable() {
833		public void realRun() throws InterruptedException {
834		lock.lock();
835		assertTrue(lock.getWaitingThreads(c).isEmpty());
836	+	locked1.countDown();
837		c.await();
838		lock.unlock();
839		}});
#	Line 672 | Line 842 | public class ReentrantLockTest extends J
842		public void realRun() throws InterruptedException {
843		lock.lock();
844		assertFalse(lock.getWaitingThreads(c).isEmpty());
845	+	locked2.countDown();
846		c.await();
847		lock.unlock();
848		}});
#	Line 679 | Line 850 | public class ReentrantLockTest extends J
850		lock.lock();
851		assertTrue(lock.getWaitingThreads(c).isEmpty());
852		lock.unlock();
853	+
854		t1.start();
855	<	delay(SHORT_DELAY_MS);
855	>	await(locked1);
856	>
857	>	lock.lock();
858	>	assertHasWaiters(lock, c, t1);
859	>	assertTrue(lock.getWaitingThreads(c).contains(t1));
860	>	assertFalse(lock.getWaitingThreads(c).contains(t2));
861	>	assertEquals(1, lock.getWaitingThreads(c).size());
862	>	lock.unlock();
863	>
864		t2.start();
865	<	delay(SHORT_DELAY_MS);
865	>	await(locked2);
866	>
867		lock.lock();
868	<	assertTrue(lock.hasWaiters(c));
868	>	assertHasWaiters(lock, c, t1, t2);
869		assertTrue(lock.getWaitingThreads(c).contains(t1));
870		assertTrue(lock.getWaitingThreads(c).contains(t2));
871	+	assertEquals(2, lock.getWaitingThreads(c).size());
872		c.signalAll();
873	+	assertHasNoWaiters(lock, c);
874		lock.unlock();
875	<	delay(SHORT_DELAY_MS);
693	<	lock.lock();
694	<	assertFalse(lock.hasWaiters(c));
695	<	assertTrue(lock.getWaitingThreads(c).isEmpty());
696	<	lock.unlock();
875	>
876		awaitTermination(t1);
877		awaitTermination(t2);
699	–	}
700	–
701	–	/** A helper class for uninterruptible wait tests */
702	–	class UninterruptibleThread extends Thread {
703	–	private ReentrantLock lock;
704	–	private Condition c;
878
879	<	public volatile boolean canAwake = false;
707	<	public volatile boolean interrupted = false;
708	<	public volatile boolean lockStarted = false;
709	<
710	<	public UninterruptibleThread(ReentrantLock lock, Condition c) {
711	<	this.lock = lock;
712	<	this.c = c;
713	<	}
714	<
715	<	public synchronized void run() {
716	<	lock.lock();
717	<	lockStarted = true;
718	<
719	<	while (!canAwake) {
720	<	c.awaitUninterruptibly();
721	<	}
722	<
723	<	interrupted = isInterrupted();
724	<	lock.unlock();
725	<	}
879	>	assertHasNoWaiters(lock, c);
880		}
881
882		/**
883	<	* awaitUninterruptibly doesn't abort on interrupt
883	>	* awaitUninterruptibly is uninterruptible
884		*/
885	<	public void testAwaitUninterruptibly() throws InterruptedException {
886	<	final ReentrantLock lock = new ReentrantLock();
887	<	final Condition c = lock.newCondition();
888	<	UninterruptibleThread thread = new UninterruptibleThread(lock, c);
885	>	public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
886	>	public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
887	>	public void testAwaitUninterruptibly(boolean fair) {
888	>	final ReentrantLock lock = new ReentrantLock(fair);
889	>	final Condition condition = lock.newCondition();
890	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
891
892	<	thread.start();
892	>	Thread t1 = newStartedThread(new CheckedRunnable() {
893	>	public void realRun() {
894	>	// Interrupt before awaitUninterruptibly
895	>	lock.lock();
896	>	pleaseInterrupt.countDown();
897	>	Thread.currentThread().interrupt();
898	>	condition.awaitUninterruptibly();
899	>	assertTrue(Thread.interrupted());
900	>	lock.unlock();
901	>	}});
902
903	<	while (!thread.lockStarted) {
904	<	delay(100);
905	<	}
903	>	Thread t2 = newStartedThread(new CheckedRunnable() {
904	>	public void realRun() {
905	>	// Interrupt during awaitUninterruptibly
906	>	lock.lock();
907	>	pleaseInterrupt.countDown();
908	>	condition.awaitUninterruptibly();
909	>	assertTrue(Thread.interrupted());
910	>	lock.unlock();
911	>	}});
912
913	+	await(pleaseInterrupt);
914	+	t2.interrupt();
915		lock.lock();
916	<	try {
917	<	thread.interrupt();
918	<	thread.canAwake = true;
746	<	c.signal();
747	<	} finally {
748	<	lock.unlock();
749	<	}
750	<
751	<	thread.join();
752	<	assertTrue(thread.interrupted);
753	<	assertFalse(thread.isAlive());
754	<	}
916	>	lock.unlock();
917	>	assertThreadBlocks(t1, Thread.State.WAITING);
918	>	assertThreadBlocks(t2, Thread.State.WAITING);
919
920	<	/**
921	<	* await is interruptible
922	<	*/
759	<	public void testAwait_Interrupt() throws InterruptedException {
760	<	final PublicReentrantLock lock = new PublicReentrantLock();
761	<	final Condition c = lock.newCondition();
762	<	final CountDownLatch locked = new CountDownLatch(1);
763	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
764	<	public void realRun() throws InterruptedException {
765	<	lock.lock();
766	<	assertTrue(lock.isLocked());
767	<	assertTrue(lock.isHeldByCurrentThread());
768	<	assertHasNoWaiters(lock, c);
769	<	locked.countDown();
770	<	try {
771	<	c.await();
772	<	} finally {
773	<	assertTrue(lock.isLocked());
774	<	assertTrue(lock.isHeldByCurrentThread());
775	<	assertHasNoWaiters(lock, c);
776	<	lock.unlock();
777	<	assertFalse(Thread.interrupted());
778	<	}
779	<	}});
920	>	lock.lock();
921	>	condition.signalAll();
922	>	lock.unlock();
923
924	<	locked.await();
925	<	assertHasWaiters(lock, c, t);
783	<	t.interrupt();
784	<	awaitTermination(t);
785	<	assertFalse(lock.isLocked());
924	>	awaitTermination(t1);
925	>	awaitTermination(t2);
926		}
927
928		/**
929	<	* awaitNanos is interruptible
929	>	* await/awaitNanos/awaitUntil is interruptible
930		*/
931	<	public void testAwaitNanos_Interrupt() throws InterruptedException {
932	<	final PublicReentrantLock lock = new PublicReentrantLock();
931	>	public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
932	>	public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
933	>	public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
934	>	public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
935	>	public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
936	>	public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
937	>	public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
938	>	public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
939	>	public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
940	>	final PublicReentrantLock lock =
941	>	new PublicReentrantLock(fair);
942		final Condition c = lock.newCondition();
943	<	final CountDownLatch locked = new CountDownLatch(1);
943	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
944		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
945		public void realRun() throws InterruptedException {
946		lock.lock();
947	<	assertTrue(lock.isLocked());
799	<	assertTrue(lock.isHeldByCurrentThread());
947	>	assertLockedByMoi(lock);
948		assertHasNoWaiters(lock, c);
949	<	locked.countDown();
949	>	pleaseInterrupt.countDown();
950		try {
951	<	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
951	>	await(c, awaitMethod);
952		} finally {
953	<	assertTrue(lock.isLocked());
806	<	assertTrue(lock.isHeldByCurrentThread());
953	>	assertLockedByMoi(lock);
954		assertHasNoWaiters(lock, c);
955		lock.unlock();
956		assertFalse(Thread.interrupted());
957		}
958		}});
959
960	<	locked.await();
960	>	await(pleaseInterrupt);
961		assertHasWaiters(lock, c, t);
962		t.interrupt();
963		awaitTermination(t);
964	<	assertFalse(lock.isLocked());
964	>	assertNotLocked(lock);
965		}
966
967		/**
968	<	* awaitUntil is interruptible
968	>	* signalAll wakes up all threads
969		*/
970	<	public void testAwaitUntil_Interrupt() throws InterruptedException {
971	<	final PublicReentrantLock lock = new PublicReentrantLock();
970	>	public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
971	>	public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
972	>	public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
973	>	public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
974	>	public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
975	>	public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
976	>	public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
977	>	public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
978	>	public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
979	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
980		final Condition c = lock.newCondition();
981	<	final CountDownLatch locked = new CountDownLatch(1);
982	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
981	>	final CountDownLatch pleaseSignal = new CountDownLatch(2);
982	>	class Awaiter extends CheckedRunnable {
983		public void realRun() throws InterruptedException {
984		lock.lock();
985	<	assertTrue(lock.isLocked());
986	<	assertTrue(lock.isHeldByCurrentThread());
987	<	assertHasNoWaiters(lock, c);
988	<	locked.countDown();
989	<	java.util.Date d = new java.util.Date();
835	<	try {
836	<	c.awaitUntil(new java.util.Date(d.getTime() + 10000));
837	<	} finally {
838	<	assertTrue(lock.isLocked());
839	<	assertTrue(lock.isHeldByCurrentThread());
840	<	assertHasNoWaiters(lock, c);
841	<	lock.unlock();
842	<	assertFalse(Thread.interrupted());
843	<	}
844	<	}});
985	>	pleaseSignal.countDown();
986	>	await(c, awaitMethod);
987	>	lock.unlock();
988	>	}
989	>	}
990
991	<	locked.await();
992	<	assertHasWaiters(lock, c, t);
993	<	t.interrupt();
994	<	awaitTermination(t);
995	<	assertFalse(lock.isLocked());
991	>	Thread t1 = newStartedThread(new Awaiter());
992	>	Thread t2 = newStartedThread(new Awaiter());
993	>
994	>	await(pleaseSignal);
995	>	lock.lock();
996	>	assertHasWaiters(lock, c, t1, t2);
997	>	c.signalAll();
998	>	assertHasNoWaiters(lock, c);
999	>	lock.unlock();
1000	>	awaitTermination(t1);
1001	>	awaitTermination(t2);
1002		}
1003
1004		/**
1005	<	* signalAll wakes up all threads
1005	>	* signal wakes up waiting threads in FIFO order
1006		*/
1007	<	public void testSignalAll() throws InterruptedException {
1008	<	final ReentrantLock lock = new ReentrantLock();
1007	>	public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1008	>	public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1009	>	public void testSignalWakesFifo(boolean fair) {
1010	>	final PublicReentrantLock lock =
1011	>	new PublicReentrantLock(fair);
1012		final Condition c = lock.newCondition();
1013	+	final CountDownLatch locked1 = new CountDownLatch(1);
1014	+	final CountDownLatch locked2 = new CountDownLatch(1);
1015		Thread t1 = newStartedThread(new CheckedRunnable() {
1016		public void realRun() throws InterruptedException {
1017		lock.lock();
1018	+	locked1.countDown();
1019		c.await();
1020		lock.unlock();
1021		}});
1022
1023	+	await(locked1);
1024	+
1025		Thread t2 = newStartedThread(new CheckedRunnable() {
1026		public void realRun() throws InterruptedException {
1027		lock.lock();
1028	+	locked2.countDown();
1029		c.await();
1030		lock.unlock();
1031		}});
1032
1033	<	delay(SHORT_DELAY_MS);
1033	>	await(locked2);
1034	>
1035		lock.lock();
1036	<	c.signalAll();
1036	>	assertHasWaiters(lock, c, t1, t2);
1037	>	assertFalse(lock.hasQueuedThreads());
1038	>	c.signal();
1039	>	assertHasWaiters(lock, c, t2);
1040	>	assertTrue(lock.hasQueuedThread(t1));
1041	>	assertFalse(lock.hasQueuedThread(t2));
1042	>	c.signal();
1043	>	assertHasNoWaiters(lock, c);
1044	>	assertTrue(lock.hasQueuedThread(t1));
1045	>	assertTrue(lock.hasQueuedThread(t2));
1046		lock.unlock();
1047		awaitTermination(t1);
1048		awaitTermination(t2);
#	Line 881 | Line 1051 | public class ReentrantLockTest extends J
1051		/**
1052		* await after multiple reentrant locking preserves lock count
1053		*/
1054	<	public void testAwaitLockCount() throws InterruptedException {
1055	<	final ReentrantLock lock = new ReentrantLock();
1054	>	public void testAwaitLockCount()      { testAwaitLockCount(false); }
1055	>	public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1056	>	public void testAwaitLockCount(boolean fair) {
1057	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
1058		final Condition c = lock.newCondition();
1059	+	final CountDownLatch pleaseSignal = new CountDownLatch(2);
1060		Thread t1 = newStartedThread(new CheckedRunnable() {
1061		public void realRun() throws InterruptedException {
1062		lock.lock();
1063	+	assertLockedByMoi(lock);
1064		assertEquals(1, lock.getHoldCount());
1065	+	pleaseSignal.countDown();
1066		c.await();
1067	+	assertLockedByMoi(lock);
1068		assertEquals(1, lock.getHoldCount());
1069		lock.unlock();
1070		}});
#	Line 897 | Line 1073 | public class ReentrantLockTest extends J
1073		public void realRun() throws InterruptedException {
1074		lock.lock();
1075		lock.lock();
1076	+	assertLockedByMoi(lock);
1077		assertEquals(2, lock.getHoldCount());
1078	+	pleaseSignal.countDown();
1079		c.await();
1080	+	assertLockedByMoi(lock);
1081		assertEquals(2, lock.getHoldCount());
1082		lock.unlock();
1083		lock.unlock();
1084		}});
1085
1086	<	delay(SHORT_DELAY_MS);
1086	>	await(pleaseSignal);
1087		lock.lock();
1088	+	assertHasWaiters(lock, c, t1, t2);
1089	+	assertEquals(1, lock.getHoldCount());
1090		c.signalAll();
1091	+	assertHasNoWaiters(lock, c);
1092		lock.unlock();
1093		awaitTermination(t1);
1094		awaitTermination(t2);
#	Line 915 | Line 1097 | public class ReentrantLockTest extends J
1097		/**
1098		* A serialized lock deserializes as unlocked
1099		*/
1100	<	public void testSerialization() throws Exception {
1101	<	ReentrantLock l = new ReentrantLock();
1102	<	l.lock();
1103	<	l.unlock();
1104	<
1105	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1106	<	ObjectOutputStream out =
1107	<	new ObjectOutputStream(new BufferedOutputStream(bout));
1108	<	out.writeObject(l);
1109	<	out.close();
1110	<
1111	<	ByteArrayInputStream bin =
1112	<	new ByteArrayInputStream(bout.toByteArray());
1113	<	ObjectInputStream in =
1114	<	new ObjectInputStream(new BufferedInputStream(bin));
1115	<	ReentrantLock r = (ReentrantLock) in.readObject();
1116	<	r.lock();
1117	<	r.unlock();
1100	>	public void testSerialization()      { testSerialization(false); }
1101	>	public void testSerialization_fair() { testSerialization(true); }
1102	>	public void testSerialization(boolean fair) {
1103	>	final ReentrantLock lock = new ReentrantLock(fair);
1104	>	lock.lock();
1105	>
1106	>	ReentrantLock clone = serialClone(lock);
1107	>	assertEquals(lock.isFair(), clone.isFair());
1108	>	assertTrue(lock.isLocked());
1109	>	assertFalse(clone.isLocked());
1110	>	assertEquals(1, lock.getHoldCount());
1111	>	assertEquals(0, clone.getHoldCount());
1112	>	clone.lock();
1113	>	clone.lock();
1114	>	assertTrue(clone.isLocked());
1115	>	assertEquals(2, clone.getHoldCount());
1116	>	assertEquals(1, lock.getHoldCount());
1117	>	clone.unlock();
1118	>	clone.unlock();
1119	>	assertTrue(lock.isLocked());
1120	>	assertFalse(clone.isLocked());
1121		}
1122
1123		/**
1124		* toString indicates current lock state
1125		*/
1126	<	public void testToString() {
1127	<	ReentrantLock lock = new ReentrantLock();
1128	<	String us = lock.toString();
1129	<	assertTrue(us.indexOf("Unlocked") >= 0);
1126	>	public void testToString()      { testToString(false); }
1127	>	public void testToString_fair() { testToString(true); }
1128	>	public void testToString(boolean fair) {
1129	>	final ReentrantLock lock = new ReentrantLock(fair);
1130	>	assertTrue(lock.toString().contains("Unlocked"));
1131		lock.lock();
1132	<	String ls = lock.toString();
1133	<	assertTrue(ls.indexOf("Locked") >= 0);
1132	>	assertTrue(lock.toString().contains("Locked by"));
1133	>	lock.unlock();
1134	>	assertTrue(lock.toString().contains("Unlocked"));
1135		}
949	–
1136		}

Diff Legend

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