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.43 by jsr166, Sat May 7 03:36:23 2011 UTC vs.
Revision 1.51 by jsr166, Fri Jun 3 05:07:14 2011 UTC

#	Line 7 | Line 7
7		*/
8
9		import junit.framework.*;
10	<	import java.util.concurrent.locks.*;
11	<	import java.util.concurrent.*;
10	>	import java.util.concurrent.locks.Condition;
11	>	import java.util.concurrent.locks.ReentrantLock;
12	>	import java.util.concurrent.CountDownLatch;
13	>	import java.util.concurrent.CyclicBarrier;
14		import static java.util.concurrent.TimeUnit.MILLISECONDS;
15		import java.util.*;
14	–	import java.io.*;
16
17		public class ReentrantLockTest extends JSR166TestCase {
18		public static void main(String[] args) {
#	Line 32 | Line 33 | public class ReentrantLockTest extends J
33		}
34		}
35
35	–
36		/**
37		* A runnable calling lockInterruptibly that expects to be
38		* interrupted
#	Line 50 | Line 50 | public class ReentrantLockTest extends J
50		*/
51		static class PublicReentrantLock extends ReentrantLock {
52		PublicReentrantLock() { super(); }
53	+	PublicReentrantLock(boolean fair) { super(fair); }
54	+	public Thread getOwner() {
55	+	return super.getOwner();
56	+	}
57		public Collection<Thread> getQueuedThreads() {
58		return super.getQueuedThreads();
59		}
#	Line 59 | Line 63 | public class ReentrantLockTest extends J
63		}
64
65		/**
66	+	* Releases write lock, checking that it had a hold count of 1.
67	+	*/
68	+	void releaseLock(PublicReentrantLock lock) {
69	+	assertLockedByMoi(lock);
70	+	lock.unlock();
71	+	assertFalse(lock.isHeldByCurrentThread());
72	+	assertNotLocked(lock);
73	+	}
74	+
75	+	/**
76	+	* Spin-waits until lock.hasQueuedThread(t) becomes true.
77	+	*/
78	+	void waitForQueuedThread(PublicReentrantLock lock, Thread t) {
79	+	long startTime = System.nanoTime();
80	+	while (!lock.hasQueuedThread(t)) {
81	+	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
82	+	throw new AssertionFailedError("timed out");
83	+	Thread.yield();
84	+	}
85	+	assertTrue(t.isAlive());
86	+	assertTrue(lock.getOwner() != t);
87	+	}
88	+
89	+	/**
90	+	* Checks that lock is not locked.
91	+	*/
92	+	void assertNotLocked(PublicReentrantLock lock) {
93	+	assertFalse(lock.isLocked());
94	+	assertFalse(lock.isHeldByCurrentThread());
95	+	assertNull(lock.getOwner());
96	+	assertEquals(0, lock.getHoldCount());
97	+	}
98	+
99	+	/**
100	+	* Checks that lock is locked by the given thread.
101	+	*/
102	+	void assertLockedBy(PublicReentrantLock lock, Thread t) {
103	+	assertTrue(lock.isLocked());
104	+	assertSame(t, lock.getOwner());
105	+	assertEquals(t == Thread.currentThread(),
106	+	lock.isHeldByCurrentThread());
107	+	assertEquals(t == Thread.currentThread(),
108	+	lock.getHoldCount() > 0);
109	+	}
110	+
111	+	/**
112	+	* Checks that lock is locked by the current thread.
113	+	*/
114	+	void assertLockedByMoi(PublicReentrantLock lock) {
115	+	assertLockedBy(lock, Thread.currentThread());
116	+	}
117	+
118	+	/**
119		* Checks that condition c has no waiters.
120		*/
121		void assertHasNoWaiters(PublicReentrantLock lock, Condition c) {
#	Line 80 | Line 137 | public class ReentrantLockTest extends J
137		lock.unlock();
138		}
139
140	+	enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
141	+
142		/**
143	<	* Constructor sets given fairness
143	>	* Awaits condition using the specified AwaitMethod.
144		*/
145	<	public void testConstructor() {
146	<	assertFalse(new ReentrantLock().isFair());
147	<	assertFalse(new ReentrantLock(false).isFair());
148	<	assertTrue(new ReentrantLock(true).isFair());
145	>	void await(Condition c, AwaitMethod awaitMethod)
146	>	throws InterruptedException {
147	>	long timeoutMillis = 2 * LONG_DELAY_MS;
148	>	switch (awaitMethod) {
149	>	case await:
150	>	c.await();
151	>	break;
152	>	case awaitTimed:
153	>	assertTrue(c.await(timeoutMillis, MILLISECONDS));
154	>	break;
155	>	case awaitNanos:
156	>	long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
157	>	long nanosRemaining = c.awaitNanos(nanosTimeout);
158	>	assertTrue(nanosRemaining > 0);
159	>	break;
160	>	case awaitUntil:
161	>	assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
162	>	break;
163	>	}
164		}
165
166		/**
167	<	* locking an unlocked lock succeeds
167	>	* Constructor sets given fairness, and is in unlocked state
168		*/
169	<	public void testLock() {
170	<	ReentrantLock rl = new ReentrantLock();
171	<	rl.lock();
172	<	assertTrue(rl.isLocked());
173	<	rl.unlock();
174	<	assertFalse(rl.isLocked());
169	>	public void testConstructor() {
170	>	PublicReentrantLock lock;
171	>
172	>	lock = new PublicReentrantLock();
173	>	assertFalse(lock.isFair());
174	>	assertNotLocked(lock);
175	>
176	>	lock = new PublicReentrantLock(true);
177	>	assertTrue(lock.isFair());
178	>	assertNotLocked(lock);
179	>
180	>	lock = new PublicReentrantLock(false);
181	>	assertFalse(lock.isFair());
182	>	assertNotLocked(lock);
183		}
184
185		/**
186	<	* locking an unlocked fair lock succeeds
187	<	*/
188	<	public void testFairLock() {
189	<	ReentrantLock rl = new ReentrantLock(true);
190	<	rl.lock();
191	<	assertTrue(rl.isLocked());
192	<	rl.unlock();
186	>	* locking an unlocked lock succeeds
187	>	*/
188	>	public void testLock()      { testLock(false); }
189	>	public void testLock_fair() { testLock(true); }
190	>	public void testLock(boolean fair) {
191	>	PublicReentrantLock lock = new PublicReentrantLock(fair);
192	>	lock.lock();
193	>	assertLockedByMoi(lock);
194	>	releaseLock(lock);
195		}
196
197		/**
198		* Unlocking an unlocked lock throws IllegalMonitorStateException
199		*/
200	<	public void testUnlock_IllegalMonitorStateException() {
201	<	ReentrantLock rl = new ReentrantLock();
200	>	public void testUnlock_IMSE()      { testUnlock_IMSE(false); }
201	>	public void testUnlock_IMSE_fair() { testUnlock_IMSE(true); }
202	>	public void testUnlock_IMSE(boolean fair) {
203	>	ReentrantLock lock = new ReentrantLock(fair);
204		try {
205	<	rl.unlock();
205	>	lock.unlock();
206		shouldThrow();
207		} catch (IllegalMonitorStateException success) {}
208		}
#	Line 124 | Line 210 | public class ReentrantLockTest extends J
210		/**
211		* tryLock on an unlocked lock succeeds
212		*/
213	<	public void testTryLock() {
214	<	ReentrantLock rl = new ReentrantLock();
215	<	assertTrue(rl.tryLock());
216	<	assertTrue(rl.isLocked());
217	<	rl.unlock();
213	>	public void testTryLock()      { testTryLock(false); }
214	>	public void testTryLock_fair() { testTryLock(true); }
215	>	public void testTryLock(boolean fair) {
216	>	PublicReentrantLock lock = new PublicReentrantLock(fair);
217	>	assertTrue(lock.tryLock());
218	>	assertLockedByMoi(lock);
219	>	assertTrue(lock.tryLock());
220	>	assertLockedByMoi(lock);
221	>	lock.unlock();
222	>	releaseLock(lock);
223		}
224
134	–
225		/**
226		* hasQueuedThreads reports whether there are waiting threads
227		*/
228	<	public void testhasQueuedThreads() throws InterruptedException {
229	<	final ReentrantLock lock = new ReentrantLock();
228	>	public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
229	>	public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
230	>	public void testHasQueuedThreads(boolean fair) {
231	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
232		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
233		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
234		assertFalse(lock.hasQueuedThreads());
235		lock.lock();
236	+	assertFalse(lock.hasQueuedThreads());
237		t1.start();
238	<	delay(SHORT_DELAY_MS);
238	>	waitForQueuedThread(lock, t1);
239		assertTrue(lock.hasQueuedThreads());
240		t2.start();
241	<	delay(SHORT_DELAY_MS);
241	>	waitForQueuedThread(lock, t2);
242		assertTrue(lock.hasQueuedThreads());
243		t1.interrupt();
244	<	delay(SHORT_DELAY_MS);
244	>	awaitTermination(t1);
245		assertTrue(lock.hasQueuedThreads());
246		lock.unlock();
154	–	delay(SHORT_DELAY_MS);
155	–	assertFalse(lock.hasQueuedThreads());
156	–	awaitTermination(t1);
247		awaitTermination(t2);
248	+	assertFalse(lock.hasQueuedThreads());
249		}
250
251		/**
252		* getQueueLength reports number of waiting threads
253		*/
254	<	public void testGetQueueLength() throws InterruptedException {
255	<	final ReentrantLock lock = new ReentrantLock();
254	>	public void testGetQueueLength()      { testGetQueueLength(false); }
255	>	public void testGetQueueLength_fair() { testGetQueueLength(true); }
256	>	public void testGetQueueLength(boolean fair) {
257	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
258		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
259		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
260		assertEquals(0, lock.getQueueLength());
261		lock.lock();
262		t1.start();
263	<	delay(SHORT_DELAY_MS);
263	>	waitForQueuedThread(lock, t1);
264		assertEquals(1, lock.getQueueLength());
265		t2.start();
266	<	delay(SHORT_DELAY_MS);
266	>	waitForQueuedThread(lock, t2);
267		assertEquals(2, lock.getQueueLength());
268		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());
269		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);
270		assertEquals(1, lock.getQueueLength());
271		lock.unlock();
204	–	delay(SHORT_DELAY_MS);
205	–	assertEquals(0, lock.getQueueLength());
206	–	awaitTermination(t1);
272		awaitTermination(t2);
273	+	assertEquals(0, lock.getQueueLength());
274		}
275
276		/**
277		* hasQueuedThread(null) throws NPE
278		*/
279	<	public void testHasQueuedThreadNPE() {
280	<	final ReentrantLock sync = new ReentrantLock();
279	>	public void testHasQueuedThreadNPE()      { testHasQueuedThreadNPE(false); }
280	>	public void testHasQueuedThreadNPE_fair() { testHasQueuedThreadNPE(true); }
281	>	public void testHasQueuedThreadNPE(boolean fair) {
282	>	final ReentrantLock lock = new ReentrantLock(fair);
283		try {
284	<	sync.hasQueuedThread(null);
284	>	lock.hasQueuedThread(null);
285		shouldThrow();
286		} catch (NullPointerException success) {}
287		}
288
289		/**
290	<	* hasQueuedThread reports whether a thread is queued.
290	>	* hasQueuedThread reports whether a thread is queued
291		*/
292	<	public void testHasQueuedThread() throws InterruptedException {
293	<	final ReentrantLock sync = new ReentrantLock();
294	<	Thread t1 = new Thread(new InterruptedLockRunnable(sync));
295	<	Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
296	<	assertFalse(sync.hasQueuedThread(t1));
297	<	assertFalse(sync.hasQueuedThread(t2));
298	<	sync.lock();
292	>	public void testHasQueuedThread()      { testHasQueuedThread(false); }
293	>	public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
294	>	public void testHasQueuedThread(boolean fair) {
295	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
296	>	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
297	>	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
298	>	assertFalse(lock.hasQueuedThread(t1));
299	>	assertFalse(lock.hasQueuedThread(t2));
300	>	lock.lock();
301		t1.start();
302	<	delay(SHORT_DELAY_MS);
303	<	assertTrue(sync.hasQueuedThread(t1));
302	>	waitForQueuedThread(lock, t1);
303	>	assertTrue(lock.hasQueuedThread(t1));
304	>	assertFalse(lock.hasQueuedThread(t2));
305		t2.start();
306	<	delay(SHORT_DELAY_MS);
307	<	assertTrue(sync.hasQueuedThread(t1));
308	<	assertTrue(sync.hasQueuedThread(t2));
306	>	waitForQueuedThread(lock, t2);
307	>	assertTrue(lock.hasQueuedThread(t1));
308	>	assertTrue(lock.hasQueuedThread(t2));
309		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));
310		awaitTermination(t1);
311	+	assertFalse(lock.hasQueuedThread(t1));
312	+	assertTrue(lock.hasQueuedThread(t2));
313	+	lock.unlock();
314		awaitTermination(t2);
315	+	assertFalse(lock.hasQueuedThread(t1));
316	+	assertFalse(lock.hasQueuedThread(t2));
317		}
318
251	–
319		/**
320		* getQueuedThreads includes waiting threads
321		*/
322	<	public void testGetQueuedThreads() throws InterruptedException {
323	<	final PublicReentrantLock lock = new PublicReentrantLock();
322	>	public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
323	>	public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
324	>	public void testGetQueuedThreads(boolean fair) {
325	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
326		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
327		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
328		assertTrue(lock.getQueuedThreads().isEmpty());
329		lock.lock();
330		assertTrue(lock.getQueuedThreads().isEmpty());
331		t1.start();
332	<	delay(SHORT_DELAY_MS);
332	>	waitForQueuedThread(lock, t1);
333	>	assertEquals(1, lock.getQueuedThreads().size());
334		assertTrue(lock.getQueuedThreads().contains(t1));
335		t2.start();
336	<	delay(SHORT_DELAY_MS);
336	>	waitForQueuedThread(lock, t2);
337	>	assertEquals(2, lock.getQueuedThreads().size());
338		assertTrue(lock.getQueuedThreads().contains(t1));
339		assertTrue(lock.getQueuedThreads().contains(t2));
340		t1.interrupt();
341	<	delay(SHORT_DELAY_MS);
341	>	awaitTermination(t1);
342		assertFalse(lock.getQueuedThreads().contains(t1));
343		assertTrue(lock.getQueuedThreads().contains(t2));
344	+	assertEquals(1, lock.getQueuedThreads().size());
345		lock.unlock();
274	–	delay(SHORT_DELAY_MS);
275	–	assertTrue(lock.getQueuedThreads().isEmpty());
276	–	awaitTermination(t1);
346		awaitTermination(t2);
347	+	assertTrue(lock.getQueuedThreads().isEmpty());
348		}
349
280	–
350		/**
351	<	* timed tryLock is interruptible.
351	>	* timed tryLock is interruptible
352		*/
353	<	public void testInterruptedException2() throws InterruptedException {
354	<	final ReentrantLock lock = new ReentrantLock();
353	>	public void testTryLock_Interruptible()      { testTryLock_Interruptible(false); }
354	>	public void testTryLock_Interruptible_fair() { testTryLock_Interruptible(true); }
355	>	public void testTryLock_Interruptible(boolean fair) {
356	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
357		lock.lock();
358		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
359		public void realRun() throws InterruptedException {
360	<	lock.tryLock(MEDIUM_DELAY_MS,MILLISECONDS);
360	>	lock.tryLock(2 * LONG_DELAY_MS, MILLISECONDS);
361		}});
362
363	<	delay(SHORT_DELAY_MS);
363	>	waitForQueuedThread(lock, t);
364		t.interrupt();
365		awaitTermination(t);
366	+	releaseLock(lock);
367		}
368
297	–
369		/**
370	<	* TryLock on a locked lock fails
370	>	* tryLock on a locked lock fails
371		*/
372	<	public void testTryLockWhenLocked() throws InterruptedException {
373	<	final ReentrantLock lock = new ReentrantLock();
372	>	public void testTryLockWhenLocked()      { testTryLockWhenLocked(false); }
373	>	public void testTryLockWhenLocked_fair() { testTryLockWhenLocked(true); }
374	>	public void testTryLockWhenLocked(boolean fair) {
375	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
376		lock.lock();
377		Thread t = newStartedThread(new CheckedRunnable() {
378		public void realRun() {
#	Line 307 | Line 380 | public class ReentrantLockTest extends J
380		}});
381
382		awaitTermination(t);
383	<	lock.unlock();
383	>	releaseLock(lock);
384		}
385
386		/**
387		* Timed tryLock on a locked lock times out
388		*/
389	<	public void testTryLock_Timeout() throws InterruptedException {
390	<	final ReentrantLock lock = new ReentrantLock();
389	>	public void testTryLock_Timeout()      { testTryLock_Timeout(false); }
390	>	public void testTryLock_Timeout_fair() { testTryLock_Timeout(true); }
391	>	public void testTryLock_Timeout(boolean fair) {
392	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
393		lock.lock();
394		Thread t = newStartedThread(new CheckedRunnable() {
395		public void realRun() throws InterruptedException {
396	<	assertFalse(lock.tryLock(1, MILLISECONDS));
396	>	long startTime = System.nanoTime();
397	>	long timeoutMillis = 10;
398	>	assertFalse(lock.tryLock(timeoutMillis, MILLISECONDS));
399	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
400		}});
401
402		awaitTermination(t);
403	<	lock.unlock();
403	>	releaseLock(lock);
404		}
405
406		/**
407		* getHoldCount returns number of recursive holds
408		*/
409	<	public void testGetHoldCount() {
410	<	ReentrantLock lock = new ReentrantLock();
409	>	public void testGetHoldCount()      { testGetHoldCount(false); }
410	>	public void testGetHoldCount_fair() { testGetHoldCount(true); }
411	>	public void testGetHoldCount(boolean fair) {
412	>	ReentrantLock lock = new ReentrantLock(fair);
413		for (int i = 1; i <= SIZE; i++) {
414		lock.lock();
415		assertEquals(i, lock.getHoldCount());
#	Line 340 | Line 420 | public class ReentrantLockTest extends J
420		}
421		}
422
343	–
423		/**
424		* isLocked is true when locked and false when not
425		*/
426	<	public void testIsLocked() throws InterruptedException {
427	<	final ReentrantLock lock = new ReentrantLock();
428	<	lock.lock();
429	<	assertTrue(lock.isLocked());
430	<	lock.unlock();
431	<	assertFalse(lock.isLocked());
432	<	Thread t = newStartedThread(new CheckedRunnable() {
433	<	public void realRun() throws InterruptedException {
434	<	lock.lock();
435	<	delay(SMALL_DELAY_MS);
436	<	lock.unlock();
437	<	}});
438	<
439	<	delay(SHORT_DELAY_MS);
440	<	assertTrue(lock.isLocked());
441	<	awaitTermination(t);
442	<	assertFalse(lock.isLocked());
443	<	}
444	<
445	<
446	<	/**
447	<	* lockInterruptibly is interruptible.
448	<	*/
449	<	public void testLockInterruptibly1() throws InterruptedException {
450	<	final ReentrantLock lock = new ReentrantLock();
451	<	lock.lock();
452	<	Thread t = newStartedThread(new InterruptedLockRunnable(lock));
453	<	delay(SHORT_DELAY_MS);
454	<	t.interrupt();
455	<	delay(SHORT_DELAY_MS);
456	<	lock.unlock();
457	<	awaitTermination(t);
426	>	public void testIsLocked()      { testIsLocked(false); }
427	>	public void testIsLocked_fair() { testIsLocked(true); }
428	>	public void testIsLocked(boolean fair) {
429	>	try {
430	>	final ReentrantLock lock = new ReentrantLock(fair);
431	>	assertFalse(lock.isLocked());
432	>	lock.lock();
433	>	assertTrue(lock.isLocked());
434	>	lock.lock();
435	>	assertTrue(lock.isLocked());
436	>	lock.unlock();
437	>	assertTrue(lock.isLocked());
438	>	lock.unlock();
439	>	assertFalse(lock.isLocked());
440	>	final CyclicBarrier barrier = new CyclicBarrier(2);
441	>	Thread t = newStartedThread(new CheckedRunnable() {
442	>	public void realRun() throws Exception {
443	>	lock.lock();
444	>	assertTrue(lock.isLocked());
445	>	barrier.await();
446	>	barrier.await();
447	>	lock.unlock();
448	>	}});
449	>
450	>	barrier.await();
451	>	assertTrue(lock.isLocked());
452	>	barrier.await();
453	>	awaitTermination(t);
454	>	assertFalse(lock.isLocked());
455	>	} catch (Exception e) {
456	>	threadUnexpectedException(e);
457	>	}
458		}
459
460		/**
461		* lockInterruptibly succeeds when unlocked, else is interruptible
462		*/
463	<	public void testLockInterruptibly2() throws InterruptedException {
464	<	final ReentrantLock lock = new ReentrantLock();
465	<	lock.lockInterruptibly();
463	>	public void testLockInterruptibly()      { testLockInterruptibly(false); }
464	>	public void testLockInterruptibly_fair() { testLockInterruptibly(true); }
465	>	public void testLockInterruptibly(boolean fair) {
466	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
467	>	try {
468	>	lock.lockInterruptibly();
469	>	} catch (InterruptedException ie) {
470	>	threadUnexpectedException(ie);
471	>	}
472	>	assertLockedByMoi(lock);
473		Thread t = newStartedThread(new InterruptedLockRunnable(lock));
474	<	delay(SHORT_DELAY_MS);
474	>	waitForQueuedThread(lock, t);
475		t.interrupt();
476		assertTrue(lock.isLocked());
477		assertTrue(lock.isHeldByCurrentThread());
478		awaitTermination(t);
479	+	releaseLock(lock);
480		}
481
482		/**
483		* Calling await without holding lock throws IllegalMonitorStateException
484		*/
485	<	public void testAwait_IllegalMonitor() throws InterruptedException {
486	<	final ReentrantLock lock = new ReentrantLock();
487	<	final Condition c = lock.newCondition();
488	<	try {
489	<	c.await();
490	<	shouldThrow();
491	<	} catch (IllegalMonitorStateException success) {}
485	>	public void testAwait_IMSE()      { testAwait_IMSE(false); }
486	>	public void testAwait_IMSE_fair() { testAwait_IMSE(true); }
487	>	public void testAwait_IMSE(boolean fair) {
488	>	final ReentrantLock lock = new ReentrantLock(fair);
489	>	final Condition c = lock.newCondition();
490	>	for (AwaitMethod awaitMethod : AwaitMethod.values()) {
491	>	long startTime = System.nanoTime();
492	>	try {
493	>	await(c, awaitMethod);
494	>	shouldThrow();
495	>	} catch (IllegalMonitorStateException success) {
496	>	} catch (InterruptedException e) { threadUnexpectedException(e); }
497	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
498	>	}
499		}
500
501		/**
502		* Calling signal without holding lock throws IllegalMonitorStateException
503		*/
504	<	public void testSignal_IllegalMonitor() {
505	<	final ReentrantLock lock = new ReentrantLock();
504	>	public void testSignal_IMSE()      { testSignal_IMSE(false); }
505	>	public void testSignal_IMSE_fair() { testSignal_IMSE(true); }
506	>	public void testSignal_IMSE(boolean fair) {
507	>	final ReentrantLock lock = new ReentrantLock(fair);
508		final Condition c = lock.newCondition();
509		try {
510		c.signal();
#	Line 419 | Line 515 | public class ReentrantLockTest extends J
515		/**
516		* awaitNanos without a signal times out
517		*/
518	<	public void testAwaitNanos_Timeout() throws InterruptedException {
519	<	final ReentrantLock lock = new ReentrantLock();
520	<	final Condition c = lock.newCondition();
521	<	lock.lock();
522	<	long t = c.awaitNanos(100);
523	<	assertTrue(t <= 0);
524	<	lock.unlock();
518	>	public void testAwaitNanos_Timeout()      { testAwaitNanos_Timeout(false); }
519	>	public void testAwaitNanos_Timeout_fair() { testAwaitNanos_Timeout(true); }
520	>	public void testAwaitNanos_Timeout(boolean fair) {
521	>	try {
522	>	final ReentrantLock lock = new ReentrantLock(fair);
523	>	final Condition c = lock.newCondition();
524	>	lock.lock();
525	>	long startTime = System.nanoTime();
526	>	long timeoutMillis = 10;
527	>	long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
528	>	long nanosRemaining = c.awaitNanos(timeoutNanos);
529	>	assertTrue(nanosRemaining <= 0);
530	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
531	>	lock.unlock();
532	>	} catch (InterruptedException e) {
533	>	threadUnexpectedException(e);
534	>	}
535		}
536
537		/**
538		* timed await without a signal times out
539		*/
540	<	public void testAwait_Timeout() throws InterruptedException {
541	<	final ReentrantLock lock = new ReentrantLock();
542	<	final Condition c = lock.newCondition();
543	<	lock.lock();
544	<	assertFalse(c.await(SHORT_DELAY_MS, MILLISECONDS));
545	<	lock.unlock();
540	>	public void testAwait_Timeout()      { testAwait_Timeout(false); }
541	>	public void testAwait_Timeout_fair() { testAwait_Timeout(true); }
542	>	public void testAwait_Timeout(boolean fair) {
543	>	try {
544	>	final ReentrantLock lock = new ReentrantLock(fair);
545	>	final Condition c = lock.newCondition();
546	>	lock.lock();
547	>	long startTime = System.nanoTime();
548	>	long timeoutMillis = 10;
549	>	assertFalse(c.await(timeoutMillis, MILLISECONDS));
550	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
551	>	lock.unlock();
552	>	} catch (InterruptedException e) {
553	>	threadUnexpectedException(e);
554	>	}
555		}
556
557		/**
558		* awaitUntil without a signal times out
559		*/
560	<	public void testAwaitUntil_Timeout() throws InterruptedException {
561	<	final ReentrantLock lock = new ReentrantLock();
562	<	final Condition c = lock.newCondition();
563	<	lock.lock();
564	<	java.util.Date d = new java.util.Date();
565	<	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
566	<	lock.unlock();
560	>	public void testAwaitUntil_Timeout()      { testAwaitUntil_Timeout(false); }
561	>	public void testAwaitUntil_Timeout_fair() { testAwaitUntil_Timeout(true); }
562	>	public void testAwaitUntil_Timeout(boolean fair) {
563	>	try {
564	>	final ReentrantLock lock = new ReentrantLock(fair);
565	>	final Condition c = lock.newCondition();
566	>	lock.lock();
567	>	long startTime = System.nanoTime();
568	>	long timeoutMillis = 10;
569	>	java.util.Date d = new java.util.Date();
570	>	assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
571	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
572	>	lock.unlock();
573	>	} catch (InterruptedException e) {
574	>	threadUnexpectedException(e);
575	>	}
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;
705	–
706	–	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	–	}
878
879	<	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();
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 c = lock.newCondition();
890	<	UninterruptibleThread thread = new UninterruptibleThread(lock, c);
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	>	c.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	>	c.awaitUninterruptibly();
909	>	assertTrue(Thread.interrupted());
910	>	lock.unlock();
911	>	}});
912
913	+	await(pleaseInterrupt);
914		lock.lock();
915	<	try {
916	<	thread.interrupt();
745	<	thread.canAwake = true;
746	<	c.signal();
747	<	} finally {
748	<	lock.unlock();
749	<	}
915	>	lock.unlock();
916	>	t2.interrupt();
917
918	<	thread.join();
919	<	assertTrue(thread.interrupted);
920	<	assertFalse(thread.isAlive());
918	>	assertThreadStaysAlive(t1);
919	>	assertTrue(t2.isAlive());
920	>
921	>	lock.lock();
922	>	c.signalAll();
923	>	lock.unlock();
924	>
925	>	awaitTermination(t1);
926	>	awaitTermination(t2);
927		}
928
929		/**
930	<	* await is interruptible
930	>	* await/awaitNanos/awaitUntil is interruptible
931		*/
932	<	public void testAwait_Interrupt() throws InterruptedException {
933	<	final PublicReentrantLock lock = new PublicReentrantLock();
932	>	public void testInterruptible_await()           { testInterruptible(false, AwaitMethod.await); }
933	>	public void testInterruptible_await_fair()      { testInterruptible(true,  AwaitMethod.await); }
934	>	public void testInterruptible_awaitTimed()      { testInterruptible(false, AwaitMethod.awaitTimed); }
935	>	public void testInterruptible_awaitTimed_fair() { testInterruptible(true,  AwaitMethod.awaitTimed); }
936	>	public void testInterruptible_awaitNanos()      { testInterruptible(false, AwaitMethod.awaitNanos); }
937	>	public void testInterruptible_awaitNanos_fair() { testInterruptible(true,  AwaitMethod.awaitNanos); }
938	>	public void testInterruptible_awaitUntil()      { testInterruptible(false, AwaitMethod.awaitUntil); }
939	>	public void testInterruptible_awaitUntil_fair() { testInterruptible(true,  AwaitMethod.awaitUntil); }
940	>	public void testInterruptible(boolean fair, final AwaitMethod awaitMethod) {
941	>	final PublicReentrantLock lock =
942	>	new PublicReentrantLock(fair);
943		final Condition c = lock.newCondition();
944	<	final CountDownLatch locked = new CountDownLatch(1);
944	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
945		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
946		public void realRun() throws InterruptedException {
947		lock.lock();
948	<	assertTrue(lock.isLocked());
767	<	assertTrue(lock.isHeldByCurrentThread());
948	>	assertLockedByMoi(lock);
949		assertHasNoWaiters(lock, c);
950	<	locked.countDown();
950	>	pleaseInterrupt.countDown();
951		try {
952	<	c.await();
952	>	await(c, awaitMethod);
953		} finally {
954	<	assertTrue(lock.isLocked());
774	<	assertTrue(lock.isHeldByCurrentThread());
954	>	assertLockedByMoi(lock);
955		assertHasNoWaiters(lock, c);
956		lock.unlock();
957		assertFalse(Thread.interrupted());
958		}
959		}});
960
961	<	locked.await();
961	>	await(pleaseInterrupt);
962		assertHasWaiters(lock, c, t);
963		t.interrupt();
964		awaitTermination(t);
965	<	assertFalse(lock.isLocked());
965	>	assertNotLocked(lock);
966		}
967
968		/**
969	<	* awaitNanos is interruptible
969	>	* signalAll wakes up all threads
970		*/
971	<	public void testAwaitNanos_Interrupt() throws InterruptedException {
972	<	final ReentrantLock lock = new ReentrantLock();
971	>	public void testSignalAll_await()           { testSignalAll(false, AwaitMethod.await); }
972	>	public void testSignalAll_await_fair()      { testSignalAll(true,  AwaitMethod.await); }
973	>	public void testSignalAll_awaitTimed()      { testSignalAll(false, AwaitMethod.awaitTimed); }
974	>	public void testSignalAll_awaitTimed_fair() { testSignalAll(true,  AwaitMethod.awaitTimed); }
975	>	public void testSignalAll_awaitNanos()      { testSignalAll(false, AwaitMethod.awaitNanos); }
976	>	public void testSignalAll_awaitNanos_fair() { testSignalAll(true,  AwaitMethod.awaitNanos); }
977	>	public void testSignalAll_awaitUntil()      { testSignalAll(false, AwaitMethod.awaitUntil); }
978	>	public void testSignalAll_awaitUntil_fair() { testSignalAll(true,  AwaitMethod.awaitUntil); }
979	>	public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
980	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
981		final Condition c = lock.newCondition();
982	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
982	>	final CountDownLatch pleaseSignal = new CountDownLatch(2);
983	>	class Awaiter extends CheckedRunnable {
984		public void realRun() throws InterruptedException {
985		lock.lock();
986	<	c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS));
987	<	}});
988	<
989	<	delay(SHORT_DELAY_MS);
990	<	t.interrupt();
802	<	awaitTermination(t);
803	<	}
986	>	pleaseSignal.countDown();
987	>	await(c, awaitMethod);
988	>	lock.unlock();
989	>	}
990	>	}
991
992	<	/**
993	<	* awaitUntil is interruptible
807	<	*/
808	<	public void testAwaitUntil_Interrupt() throws InterruptedException {
809	<	final ReentrantLock lock = new ReentrantLock();
810	<	final Condition c = lock.newCondition();
811	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
812	<	public void realRun() throws InterruptedException {
813	<	lock.lock();
814	<	java.util.Date d = new java.util.Date();
815	<	c.awaitUntil(new java.util.Date(d.getTime() + 10000));
816	<	}});
992	>	Thread t1 = newStartedThread(new Awaiter());
993	>	Thread t2 = newStartedThread(new Awaiter());
994
995	<	delay(SHORT_DELAY_MS);
996	<	t.interrupt();
997	<	awaitTermination(t);
995	>	await(pleaseSignal);
996	>	lock.lock();
997	>	assertHasWaiters(lock, c, t1, t2);
998	>	c.signalAll();
999	>	assertHasNoWaiters(lock, c);
1000	>	lock.unlock();
1001	>	awaitTermination(t1);
1002	>	awaitTermination(t2);
1003		}
1004
1005		/**
1006	<	* signalAll wakes up all threads
1006	>	* signal wakes up waiting threads in FIFO order
1007		*/
1008	<	public void testSignalAll() throws InterruptedException {
1009	<	final ReentrantLock lock = new ReentrantLock();
1008	>	public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1009	>	public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
1010	>	public void testSignalWakesFifo(boolean fair) {
1011	>	final PublicReentrantLock lock =
1012	>	new PublicReentrantLock(fair);
1013		final Condition c = lock.newCondition();
1014	+	final CountDownLatch locked1 = new CountDownLatch(1);
1015	+	final CountDownLatch locked2 = new CountDownLatch(1);
1016		Thread t1 = newStartedThread(new CheckedRunnable() {
1017		public void realRun() throws InterruptedException {
1018		lock.lock();
1019	+	locked1.countDown();
1020		c.await();
1021		lock.unlock();
1022		}});
1023
1024	+	await(locked1);
1025	+
1026		Thread t2 = newStartedThread(new CheckedRunnable() {
1027		public void realRun() throws InterruptedException {
1028		lock.lock();
1029	+	locked2.countDown();
1030		c.await();
1031		lock.unlock();
1032		}});
1033
1034	<	delay(SHORT_DELAY_MS);
1034	>	await(locked2);
1035	>
1036		lock.lock();
1037	<	c.signalAll();
1037	>	assertHasWaiters(lock, c, t1, t2);
1038	>	assertFalse(lock.hasQueuedThreads());
1039	>	c.signal();
1040	>	assertHasWaiters(lock, c, t2);
1041	>	assertTrue(lock.hasQueuedThread(t1));
1042	>	assertFalse(lock.hasQueuedThread(t2));
1043	>	c.signal();
1044	>	assertHasNoWaiters(lock, c);
1045	>	assertTrue(lock.hasQueuedThread(t1));
1046	>	assertTrue(lock.hasQueuedThread(t2));
1047		lock.unlock();
1048		awaitTermination(t1);
1049		awaitTermination(t2);
#	Line 851 | Line 1052 | public class ReentrantLockTest extends J
1052		/**
1053		* await after multiple reentrant locking preserves lock count
1054		*/
1055	<	public void testAwaitLockCount() throws InterruptedException {
1056	<	final ReentrantLock lock = new ReentrantLock();
1055	>	public void testAwaitLockCount()      { testAwaitLockCount(false); }
1056	>	public void testAwaitLockCount_fair() { testAwaitLockCount(true); }
1057	>	public void testAwaitLockCount(boolean fair) {
1058	>	final PublicReentrantLock lock = new PublicReentrantLock(fair);
1059		final Condition c = lock.newCondition();
1060	+	final CountDownLatch pleaseSignal = new CountDownLatch(2);
1061		Thread t1 = newStartedThread(new CheckedRunnable() {
1062		public void realRun() throws InterruptedException {
1063		lock.lock();
1064	+	assertLockedByMoi(lock);
1065		assertEquals(1, lock.getHoldCount());
1066	+	pleaseSignal.countDown();
1067		c.await();
1068	+	assertLockedByMoi(lock);
1069		assertEquals(1, lock.getHoldCount());
1070		lock.unlock();
1071		}});
#	Line 867 | Line 1074 | public class ReentrantLockTest extends J
1074		public void realRun() throws InterruptedException {
1075		lock.lock();
1076		lock.lock();
1077	+	assertLockedByMoi(lock);
1078		assertEquals(2, lock.getHoldCount());
1079	+	pleaseSignal.countDown();
1080		c.await();
1081	+	assertLockedByMoi(lock);
1082		assertEquals(2, lock.getHoldCount());
1083		lock.unlock();
1084		lock.unlock();
1085		}});
1086
1087	<	delay(SHORT_DELAY_MS);
1087	>	await(pleaseSignal);
1088		lock.lock();
1089	+	assertHasWaiters(lock, c, t1, t2);
1090	+	assertEquals(1, lock.getHoldCount());
1091		c.signalAll();
1092	+	assertHasNoWaiters(lock, c);
1093		lock.unlock();
1094		awaitTermination(t1);
1095		awaitTermination(t2);
#	Line 885 | Line 1098 | public class ReentrantLockTest extends J
1098		/**
1099		* A serialized lock deserializes as unlocked
1100		*/
1101	<	public void testSerialization() throws Exception {
1102	<	ReentrantLock l = new ReentrantLock();
1103	<	l.lock();
1104	<	l.unlock();
1105	<
1106	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1107	<	ObjectOutputStream out =
1108	<	new ObjectOutputStream(new BufferedOutputStream(bout));
1109	<	out.writeObject(l);
1110	<	out.close();
1111	<
1112	<	ByteArrayInputStream bin =
1113	<	new ByteArrayInputStream(bout.toByteArray());
1114	<	ObjectInputStream in =
1115	<	new ObjectInputStream(new BufferedInputStream(bin));
1116	<	ReentrantLock r = (ReentrantLock) in.readObject();
1117	<	r.lock();
1118	<	r.unlock();
1101	>	public void testSerialization()      { testSerialization(false); }
1102	>	public void testSerialization_fair() { testSerialization(true); }
1103	>	public void testSerialization(boolean fair) {
1104	>	ReentrantLock lock = new ReentrantLock(fair);
1105	>	lock.lock();
1106	>
1107	>	ReentrantLock clone = serialClone(lock);
1108	>	assertEquals(lock.isFair(), clone.isFair());
1109	>	assertTrue(lock.isLocked());
1110	>	assertFalse(clone.isLocked());
1111	>	assertEquals(1, lock.getHoldCount());
1112	>	assertEquals(0, clone.getHoldCount());
1113	>	clone.lock();
1114	>	clone.lock();
1115	>	assertTrue(clone.isLocked());
1116	>	assertEquals(2, clone.getHoldCount());
1117	>	assertEquals(1, lock.getHoldCount());
1118	>	clone.unlock();
1119	>	clone.unlock();
1120	>	assertTrue(lock.isLocked());
1121	>	assertFalse(clone.isLocked());
1122		}
1123
1124		/**
1125		* toString indicates current lock state
1126		*/
1127	<	public void testToString() {
1128	<	ReentrantLock lock = new ReentrantLock();
1129	<	String us = lock.toString();
1130	<	assertTrue(us.indexOf("Unlocked") >= 0);
1127	>	public void testToString()      { testToString(false); }
1128	>	public void testToString_fair() { testToString(true); }
1129	>	public void testToString(boolean fair) {
1130	>	ReentrantLock lock = new ReentrantLock(fair);
1131	>	assertTrue(lock.toString().contains("Unlocked"));
1132		lock.lock();
1133	<	String ls = lock.toString();
1134	<	assertTrue(ls.indexOf("Locked") >= 0);
1133	>	assertTrue(lock.toString().contains("Locked"));
1134	>	lock.unlock();
1135	>	assertTrue(lock.toString().contains("Unlocked"));
1136		}
919	–
1137		}

Diff Legend

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