ViewVC Help

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

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

Comparing jsr166/src/test/tck/SemaphoreTest.java (file contents):
Revision 1.21 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.34 by jsr166, Sat Apr 25 04:55:31 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
10	–	import java.util.*;
11	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.io.*;
10	>
11	>	import java.util.Collection;
12	>	import java.util.concurrent.CountDownLatch;
13	>	import java.util.concurrent.Semaphore;
14	>
15	>	import junit.framework.AssertionFailedError;
16	>	import junit.framework.Test;
17	>	import junit.framework.TestSuite;
18
19		public class SemaphoreTest extends JSR166TestCase {
20		public static void main(String[] args) {
21	<	junit.textui.TestRunner.run (suite());
21	>	main(suite(), args);
22		}
23		public static Test suite() {
24		return new TestSuite(SemaphoreTest.class);
#	Line 24 | Line 28 | public class SemaphoreTest extends JSR16
28		* Subclass to expose protected methods
29		*/
30		static class PublicSemaphore extends Semaphore {
31	<	PublicSemaphore(int p, boolean f) { super(p, f); }
31	>	PublicSemaphore(int permits) { super(permits); }
32	>	PublicSemaphore(int permits, boolean fair) { super(permits, fair); }
33		public Collection<Thread> getQueuedThreads() {
34		return super.getQueuedThreads();
35		}
36	<	public void reducePermits(int p) {
37	<	super.reducePermits(p);
36	>	public boolean hasQueuedThread(Thread t) {
37	>	return super.getQueuedThreads().contains(t);
38	>	}
39	>	public void reducePermits(int reduction) {
40	>	super.reducePermits(reduction);
41		}
42		}
43
#	Line 38 | Line 46 | public class SemaphoreTest extends JSR16
46		*/
47		class InterruptibleLockRunnable extends CheckedRunnable {
48		final Semaphore lock;
49	<	InterruptibleLockRunnable(Semaphore l) { lock = l; }
49	>	InterruptibleLockRunnable(Semaphore s) { lock = s; }
50		public void realRun() {
51		try {
52		lock.acquire();
#	Line 47 | Line 55 | public class SemaphoreTest extends JSR16
55		}
56		}
57
50	–
58		/**
59		* A runnable calling acquire that expects to be interrupted
60		*/
61		class InterruptedLockRunnable extends CheckedInterruptedRunnable {
62		final Semaphore lock;
63	<	InterruptedLockRunnable(Semaphore l) { lock = l; }
63	>	InterruptedLockRunnable(Semaphore s) { lock = s; }
64		public void realRun() throws InterruptedException {
65		lock.acquire();
66		}
67		}
68
69		/**
70	<	* Zero, negative, and positive initial values are allowed in constructor
70	>	* Spin-waits until s.hasQueuedThread(t) becomes true.
71	>	*/
72	>	void waitForQueuedThread(PublicSemaphore s, Thread t) {
73	>	long startTime = System.nanoTime();
74	>	while (!s.hasQueuedThread(t)) {
75	>	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
76	>	throw new AssertionFailedError("timed out");
77	>	Thread.yield();
78	>	}
79	>	assertTrue(s.hasQueuedThreads());
80	>	assertTrue(t.isAlive());
81	>	}
82	>
83	>	/**
84	>	* Spin-waits until s.hasQueuedThreads() becomes true.
85		*/
86	<	public void testConstructor() {
87	<	for (int permits : new int[] { -1, 0, 1 }) {
88	<	for (boolean fair : new boolean[] { false, true }) {
89	<	Semaphore s = new Semaphore(permits, fair);
90	<	assertEquals(permits, s.availablePermits());
91	<	assertEquals(fair, s.isFair());
86	>	void waitForQueuedThreads(Semaphore s) {
87	>	long startTime = System.nanoTime();
88	>	while (!s.hasQueuedThreads()) {
89	>	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
90	>	throw new AssertionFailedError("timed out");
91	>	Thread.yield();
92	>	}
93	>	}
94	>
95	>	enum AcquireMethod {
96	>	acquire() {
97	>	void acquire(Semaphore s) throws InterruptedException {
98	>	s.acquire();
99	>	}
100	>	},
101	>	acquireN() {
102	>	void acquire(Semaphore s, int permits) throws InterruptedException {
103	>	s.acquire(permits);
104	>	}
105	>	},
106	>	acquireUninterruptibly() {
107	>	void acquire(Semaphore s) {
108	>	s.acquireUninterruptibly();
109	>	}
110	>	},
111	>	acquireUninterruptiblyN() {
112	>	void acquire(Semaphore s, int permits) {
113	>	s.acquireUninterruptibly(permits);
114		}
115	+	},
116	+	tryAcquire() {
117	+	void acquire(Semaphore s) {
118	+	assertTrue(s.tryAcquire());
119	+	}
120	+	},
121	+	tryAcquireN() {
122	+	void acquire(Semaphore s, int permits) {
123	+	assertTrue(s.tryAcquire(permits));
124	+	}
125	+	},
126	+	tryAcquireTimed() {
127	+	void acquire(Semaphore s) throws InterruptedException {
128	+	assertTrue(s.tryAcquire(2 * LONG_DELAY_MS, MILLISECONDS));
129	+	}
130	+	},
131	+	tryAcquireTimedN {
132	+	void acquire(Semaphore s, int permits) throws InterruptedException {
133	+	assertTrue(s.tryAcquire(permits, 2 * LONG_DELAY_MS, MILLISECONDS));
134	+	}
135	+	};
136	+
137	+	// Intentionally meta-circular
138	+
139	+	/** Acquires 1 permit. */
140	+	void acquire(Semaphore s) throws InterruptedException {
141	+	acquire(s, 1);
142	+	}
143	+	/** Acquires the given number of permits. */
144	+	void acquire(Semaphore s, int permits) throws InterruptedException {
145	+	for (int i = 0; i < permits; i++)
146	+	acquire(s);
147	+	}
148	+	}
149	+
150	+	/**
151	+	* Zero, negative, and positive initial values are allowed in constructor
152	+	*/
153	+	public void testConstructor()      { testConstructor(false); }
154	+	public void testConstructor_fair() { testConstructor(true); }
155	+	public void testConstructor(boolean fair) {
156	+	for (int permits : new int[] { -42, -1, 0, 1, 42 }) {
157	+	Semaphore s = new Semaphore(permits, fair);
158	+	assertEquals(permits, s.availablePermits());
159	+	assertEquals(fair, s.isFair());
160		}
161		}
162
163		/**
164		* Constructor without fairness argument behaves as nonfair
165		*/
166	<	public void testConstructor2() {
167	<	for (int permits : new int[] { -1, 0, 1 }) {
166	>	public void testConstructorDefaultsToNonFair() {
167	>	for (int permits : new int[] { -42, -1, 0, 1, 42 }) {
168		Semaphore s = new Semaphore(permits);
169		assertEquals(permits, s.availablePermits());
170		assertFalse(s.isFair());
#	Line 86 | Line 174 | public class SemaphoreTest extends JSR16
174		/**
175		* tryAcquire succeeds when sufficient permits, else fails
176		*/
177	<	public void testTryAcquireInSameThread() {
178	<	Semaphore s = new Semaphore(2, false);
177	>	public void testTryAcquireInSameThread()      { testTryAcquireInSameThread(false); }
178	>	public void testTryAcquireInSameThread_fair() { testTryAcquireInSameThread(true); }
179	>	public void testTryAcquireInSameThread(boolean fair) {
180	>	Semaphore s = new Semaphore(2, fair);
181		assertEquals(2, s.availablePermits());
182		assertTrue(s.tryAcquire());
183		assertTrue(s.tryAcquire());
184		assertEquals(0, s.availablePermits());
185		assertFalse(s.tryAcquire());
186	+	assertFalse(s.tryAcquire());
187	+	assertEquals(0, s.availablePermits());
188		}
189
190		/**
191	<	* Acquire and release of semaphore succeed if initially available
100	<	*/
101	<	public void testAcquireReleaseInSameThread()
102	<	throws InterruptedException {
103	<	Semaphore s = new Semaphore(1, false);
104	<	s.acquire();
105	<	s.release();
106	<	s.acquire();
107	<	s.release();
108	<	s.acquire();
109	<	s.release();
110	<	s.acquire();
111	<	s.release();
112	<	s.acquire();
113	<	s.release();
114	<	assertEquals(1, s.availablePermits());
115	<	}
116	<
117	<	/**
118	<	* Uninterruptible acquire and release of semaphore succeed if
119	<	* initially available
120	<	*/
121	<	public void testAcquireUninterruptiblyReleaseInSameThread()
122	<	throws InterruptedException {
123	<	Semaphore s = new Semaphore(1, false);
124	<	s.acquireUninterruptibly();
125	<	s.release();
126	<	s.acquireUninterruptibly();
127	<	s.release();
128	<	s.acquireUninterruptibly();
129	<	s.release();
130	<	s.acquireUninterruptibly();
131	<	s.release();
132	<	s.acquireUninterruptibly();
133	<	s.release();
134	<	assertEquals(1, s.availablePermits());
135	<	}
136	<
137	<	/**
138	<	* Timed Acquire and release of semaphore succeed if
139	<	* initially available
140	<	*/
141	<	public void testTimedAcquireReleaseInSameThread()
142	<	throws InterruptedException {
143	<	Semaphore s = new Semaphore(1, false);
144	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
145	<	s.release();
146	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
147	<	s.release();
148	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
149	<	s.release();
150	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
151	<	s.release();
152	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
153	<	s.release();
154	<	assertEquals(1, s.availablePermits());
155	<	}
156	<
157	<	/**
158	<	* A release in one thread enables an acquire in another thread
191	>	* timed tryAcquire times out
192		*/
193	<	public void testAcquireReleaseInDifferentThreads()
194	<	throws InterruptedException {
195	<	final Semaphore s = new Semaphore(0, false);
196	<	Thread t = new Thread(new CheckedRunnable() {
197	<	public void realRun() throws InterruptedException {
198	<	s.acquire();
199	<	s.release();
200	<	s.release();
201	<	s.acquire();
193	>	public void testTryAcquire_timeout()      { testTryAcquire_timeout(false); }
194	>	public void testTryAcquire_timeout_fair() { testTryAcquire_timeout(true); }
195	>	public void testTryAcquire_timeout(boolean fair) {
196	>	Semaphore s = new Semaphore(0, fair);
197	>	long startTime = System.nanoTime();
198	>	try { assertFalse(s.tryAcquire(timeoutMillis(), MILLISECONDS)); }
199	>	catch (InterruptedException e) { threadUnexpectedException(e); }
200	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
201	>	}
202	>
203	>	/**
204	>	* timed tryAcquire(N) times out
205	>	*/
206	>	public void testTryAcquireN_timeout()      { testTryAcquireN_timeout(false); }
207	>	public void testTryAcquireN_timeout_fair() { testTryAcquireN_timeout(true); }
208	>	public void testTryAcquireN_timeout(boolean fair) {
209	>	Semaphore s = new Semaphore(2, fair);
210	>	long startTime = System.nanoTime();
211	>	try { assertFalse(s.tryAcquire(3, timeoutMillis(), MILLISECONDS)); }
212	>	catch (InterruptedException e) { threadUnexpectedException(e); }
213	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
214	>	}
215	>
216	>	/**
217	>	* acquire(), acquire(N), timed tryAcquired, timed tryAcquire(N)
218	>	* are interruptible
219	>	*/
220	>	public void testInterruptible_acquire()               { testInterruptible(false, AcquireMethod.acquire); }
221	>	public void testInterruptible_acquire_fair()          { testInterruptible(true,  AcquireMethod.acquire); }
222	>	public void testInterruptible_acquireN()              { testInterruptible(false, AcquireMethod.acquireN); }
223	>	public void testInterruptible_acquireN_fair()         { testInterruptible(true,  AcquireMethod.acquireN); }
224	>	public void testInterruptible_tryAcquireTimed()       { testInterruptible(false, AcquireMethod.tryAcquireTimed); }
225	>	public void testInterruptible_tryAcquireTimed_fair()  { testInterruptible(true,  AcquireMethod.tryAcquireTimed); }
226	>	public void testInterruptible_tryAcquireTimedN()      { testInterruptible(false, AcquireMethod.tryAcquireTimedN); }
227	>	public void testInterruptible_tryAcquireTimedN_fair() { testInterruptible(true,  AcquireMethod.tryAcquireTimedN); }
228	>	public void testInterruptible(boolean fair, final AcquireMethod acquirer) {
229	>	final PublicSemaphore s = new PublicSemaphore(0, fair);
230	>	final Semaphore pleaseInterrupt = new Semaphore(0, fair);
231	>	Thread t = newStartedThread(new CheckedRunnable() {
232	>	public void realRun() {
233	>	// Interrupt before acquire
234	>	Thread.currentThread().interrupt();
235	>	try {
236	>	acquirer.acquire(s);
237	>	shouldThrow();
238	>	} catch (InterruptedException success) {}
239	>
240	>	// Interrupt during acquire
241	>	try {
242	>	acquirer.acquire(s);
243	>	shouldThrow();
244	>	} catch (InterruptedException success) {}
245	>
246	>	// Interrupt before acquire(N)
247	>	Thread.currentThread().interrupt();
248	>	try {
249	>	acquirer.acquire(s, 3);
250	>	shouldThrow();
251	>	} catch (InterruptedException success) {}
252	>
253	>	pleaseInterrupt.release();
254	>
255	>	// Interrupt during acquire(N)
256	>	try {
257	>	acquirer.acquire(s, 3);
258	>	shouldThrow();
259	>	} catch (InterruptedException success) {}
260		}});
261
262	<	t.start();
263	<	Thread.sleep(SHORT_DELAY_MS);
264	<	s.release();
265	<	s.release();
266	<	s.acquire();
267	<	s.acquire();
177	<	s.release();
178	<	t.join();
262	>	waitForQueuedThread(s, t);
263	>	t.interrupt();
264	>	await(pleaseInterrupt);
265	>	waitForQueuedThread(s, t);
266	>	t.interrupt();
267	>	awaitTermination(t);
268		}
269
270		/**
271	<	* A release in one thread enables an uninterruptible acquire in another thread
271	>	* acquireUninterruptibly(), acquireUninterruptibly(N) are
272	>	* uninterruptible
273		*/
274	<	public void testUninterruptibleAcquireReleaseInDifferentThreads()
275	<	throws InterruptedException {
276	<	final Semaphore s = new Semaphore(0, false);
277	<	Thread t = new Thread(new CheckedRunnable() {
278	<	public void realRun() throws InterruptedException {
279	<	s.acquireUninterruptibly();
280	<	s.release();
191	<	s.release();
192	<	s.acquireUninterruptibly();
193	<	}});
194	<
195	<	t.start();
196	<	Thread.sleep(SHORT_DELAY_MS);
197	<	s.release();
198	<	s.release();
199	<	s.acquireUninterruptibly();
200	<	s.acquireUninterruptibly();
201	<	s.release();
202	<	t.join();
203	<	}
274	>	public void testUninterruptible_acquireUninterruptibly()       { testUninterruptible(false, AcquireMethod.acquireUninterruptibly); }
275	>	public void testUninterruptible_acquireUninterruptibly_fair()  { testUninterruptible(true,  AcquireMethod.acquireUninterruptibly); }
276	>	public void testUninterruptible_acquireUninterruptiblyN()      { testUninterruptible(false, AcquireMethod.acquireUninterruptiblyN); }
277	>	public void testUninterruptible_acquireUninterruptiblyN_fair() { testUninterruptible(true,  AcquireMethod.acquireUninterruptiblyN); }
278	>	public void testUninterruptible(boolean fair, final AcquireMethod acquirer) {
279	>	final PublicSemaphore s = new PublicSemaphore(0, fair);
280	>	final Semaphore pleaseInterrupt = new Semaphore(-1, fair);
281
282	<
206	<	/**
207	<	*  A release in one thread enables a timed acquire in another thread
208	<	*/
209	<	public void testTimedAcquireReleaseInDifferentThreads()
210	<	throws InterruptedException {
211	<	final Semaphore s = new Semaphore(1, false);
212	<	Thread t = new Thread(new CheckedRunnable() {
282	>	Thread t1 = newStartedThread(new CheckedRunnable() {
283		public void realRun() throws InterruptedException {
284	<	s.release();
285	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
286	<	s.release();
287	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
284	>	// Interrupt before acquire
285	>	pleaseInterrupt.release();
286	>	Thread.currentThread().interrupt();
287	>	acquirer.acquire(s);
288	>	assertTrue(Thread.interrupted());
289		}});
290
291	<	t.start();
221	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
222	<	s.release();
223	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
224	<	s.release();
225	<	s.release();
226	<	t.join();
227	<	}
228	<
229	<	/**
230	<	* A waiting acquire blocks interruptibly
231	<	*/
232	<	public void testAcquire_InterruptedException()
233	<	throws InterruptedException {
234	<	final Semaphore s = new Semaphore(0, false);
235	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
291	>	Thread t2 = newStartedThread(new CheckedRunnable() {
292		public void realRun() throws InterruptedException {
293	<	s.acquire();
293	>	// Interrupt during acquire
294	>	pleaseInterrupt.release();
295	>	acquirer.acquire(s);
296	>	assertTrue(Thread.interrupted());
297		}});
298
299	<	t.start();
300	<	Thread.sleep(SHORT_DELAY_MS);
301	<	t.interrupt();
302	<	t.join();
244	<	}
299	>	await(pleaseInterrupt);
300	>	waitForQueuedThread(s, t1);
301	>	waitForQueuedThread(s, t2);
302	>	t2.interrupt();
303
304	<	/**
305	<	*  A waiting timed acquire blocks interruptibly
248	<	*/
249	<	public void testTryAcquire_InterruptedException()
250	<	throws InterruptedException {
251	<	final Semaphore s = new Semaphore(0, false);
252	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
253	<	public void realRun() throws InterruptedException {
254	<	s.tryAcquire(MEDIUM_DELAY_MS, MILLISECONDS);
255	<	}});
304	>	assertThreadStaysAlive(t1);
305	>	assertTrue(t2.isAlive());
306
307	<	t.start();
308	<	Thread.sleep(SHORT_DELAY_MS);
309	<	t.interrupt();
310	<	t.join();
307	>	s.release(2);
308	>
309	>	awaitTermination(t1);
310	>	awaitTermination(t2);
311		}
312
313		/**
314		* hasQueuedThreads reports whether there are waiting threads
315		*/
316	<	public void testHasQueuedThreads() throws InterruptedException {
317	<	final Semaphore lock = new Semaphore(1, false);
318	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
319	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
316	>	public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
317	>	public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
318	>	public void testHasQueuedThreads(boolean fair) {
319	>	final PublicSemaphore lock = new PublicSemaphore(1, fair);
320		assertFalse(lock.hasQueuedThreads());
321		lock.acquireUninterruptibly();
322	<	t1.start();
323	<	Thread.sleep(SHORT_DELAY_MS);
322	>	Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
323	>	waitForQueuedThread(lock, t1);
324		assertTrue(lock.hasQueuedThreads());
325	<	t2.start();
326	<	Thread.sleep(SHORT_DELAY_MS);
325	>	Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
326	>	waitForQueuedThread(lock, t2);
327		assertTrue(lock.hasQueuedThreads());
328		t1.interrupt();
329	<	Thread.sleep(SHORT_DELAY_MS);
329	>	awaitTermination(t1);
330		assertTrue(lock.hasQueuedThreads());
331		lock.release();
332	<	Thread.sleep(SHORT_DELAY_MS);
332	>	awaitTermination(t2);
333		assertFalse(lock.hasQueuedThreads());
284	–	t1.join();
285	–	t2.join();
334		}
335
336		/**
337		* getQueueLength reports number of waiting threads
338		*/
339	<	public void testGetQueueLength() throws InterruptedException {
340	<	final Semaphore lock = new Semaphore(1, false);
341	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
342	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
339	>	public void testGetQueueLength()      { testGetQueueLength(false); }
340	>	public void testGetQueueLength_fair() { testGetQueueLength(true); }
341	>	public void testGetQueueLength(boolean fair) {
342	>	final PublicSemaphore lock = new PublicSemaphore(1, fair);
343		assertEquals(0, lock.getQueueLength());
344		lock.acquireUninterruptibly();
345	<	t1.start();
346	<	Thread.sleep(SHORT_DELAY_MS);
345	>	Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
346	>	waitForQueuedThread(lock, t1);
347		assertEquals(1, lock.getQueueLength());
348	<	t2.start();
349	<	Thread.sleep(SHORT_DELAY_MS);
348	>	Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
349	>	waitForQueuedThread(lock, t2);
350		assertEquals(2, lock.getQueueLength());
351		t1.interrupt();
352	<	Thread.sleep(SHORT_DELAY_MS);
352	>	awaitTermination(t1);
353		assertEquals(1, lock.getQueueLength());
354		lock.release();
355	<	Thread.sleep(SHORT_DELAY_MS);
355	>	awaitTermination(t2);
356		assertEquals(0, lock.getQueueLength());
309	–	t1.join();
310	–	t2.join();
357		}
358
359		/**
360		* getQueuedThreads includes waiting threads
361		*/
362	<	public void testGetQueuedThreads() throws InterruptedException {
363	<	final PublicSemaphore lock = new PublicSemaphore(1, false);
364	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
365	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
362	>	public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
363	>	public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
364	>	public void testGetQueuedThreads(boolean fair) {
365	>	final PublicSemaphore lock = new PublicSemaphore(1, fair);
366		assertTrue(lock.getQueuedThreads().isEmpty());
367		lock.acquireUninterruptibly();
368		assertTrue(lock.getQueuedThreads().isEmpty());
369	<	t1.start();
370	<	Thread.sleep(SHORT_DELAY_MS);
369	>	Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
370	>	waitForQueuedThread(lock, t1);
371		assertTrue(lock.getQueuedThreads().contains(t1));
372	<	t2.start();
373	<	Thread.sleep(SHORT_DELAY_MS);
372	>	Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
373	>	waitForQueuedThread(lock, t2);
374		assertTrue(lock.getQueuedThreads().contains(t1));
375		assertTrue(lock.getQueuedThreads().contains(t2));
376		t1.interrupt();
377	<	Thread.sleep(SHORT_DELAY_MS);
377	>	awaitTermination(t1);
378		assertFalse(lock.getQueuedThreads().contains(t1));
379		assertTrue(lock.getQueuedThreads().contains(t2));
380		lock.release();
381	<	Thread.sleep(SHORT_DELAY_MS);
381	>	awaitTermination(t2);
382		assertTrue(lock.getQueuedThreads().isEmpty());
337	–	t1.join();
338	–	t2.join();
383		}
384
385		/**
386		* drainPermits reports and removes given number of permits
387		*/
388	<	public void testDrainPermits() {
389	<	Semaphore s = new Semaphore(0, false);
388	>	public void testDrainPermits()      { testDrainPermits(false); }
389	>	public void testDrainPermits_fair() { testDrainPermits(true); }
390	>	public void testDrainPermits(boolean fair) {
391	>	Semaphore s = new Semaphore(0, fair);
392		assertEquals(0, s.availablePermits());
393		assertEquals(0, s.drainPermits());
394		s.release(10);
#	Line 353 | Line 399 | public class SemaphoreTest extends JSR16
399		}
400
401		/**
402	<	* reducePermits reduces number of permits
402	>	* release(-N) throws IllegalArgumentException
403		*/
404	<	public void testReducePermits() {
405	<	PublicSemaphore s = new PublicSemaphore(10, false);
406	<	assertEquals(10, s.availablePermits());
407	<	s.reducePermits(1);
408	<	assertEquals(9, s.availablePermits());
409	<	s.reducePermits(10);
410	<	assertEquals(-1, s.availablePermits());
404	>	public void testReleaseIAE()      { testReleaseIAE(false); }
405	>	public void testReleaseIAE_fair() { testReleaseIAE(true); }
406	>	public void testReleaseIAE(boolean fair) {
407	>	Semaphore s = new Semaphore(10, fair);
408	>	try {
409	>	s.release(-1);
410	>	shouldThrow();
411	>	} catch (IllegalArgumentException success) {}
412		}
413
414		/**
415	<	* a deserialized serialized semaphore has same number of permits
416	<	*/
417	<	public void testSerialization() throws Exception {
418	<	Semaphore l = new Semaphore(3, false);
419	<	l.acquire();
420	<	l.release();
421	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
422	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
423	<	out.writeObject(l);
424	<	out.close();
378	<
379	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
380	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
381	<	Semaphore r = (Semaphore) in.readObject();
382	<	assertEquals(3, r.availablePermits());
383	<	assertFalse(r.isFair());
384	<	r.acquire();
385	<	r.release();
415	>	* reducePermits(-N) throws IllegalArgumentException
416	>	*/
417	>	public void testReducePermitsIAE()      { testReducePermitsIAE(false); }
418	>	public void testReducePermitsIAE_fair() { testReducePermitsIAE(true); }
419	>	public void testReducePermitsIAE(boolean fair) {
420	>	PublicSemaphore s = new PublicSemaphore(10, fair);
421	>	try {
422	>	s.reducePermits(-1);
423	>	shouldThrow();
424	>	} catch (IllegalArgumentException success) {}
425		}
426
388	–
427		/**
428	<	* Zero, negative, and positive initial values are allowed in constructor
428	>	* reducePermits reduces number of permits
429		*/
430	<	public void testConstructor_fair() {
431	<	Semaphore s0 = new Semaphore(0, true);
432	<	assertEquals(0, s0.availablePermits());
433	<	assertTrue(s0.isFair());
434	<	Semaphore s1 = new Semaphore(-1, true);
435	<	assertEquals(-1, s1.availablePermits());
436	<	Semaphore s2 = new Semaphore(-1, true);
437	<	assertEquals(-1, s2.availablePermits());
430	>	public void testReducePermits()      { testReducePermits(false); }
431	>	public void testReducePermits_fair() { testReducePermits(true); }
432	>	public void testReducePermits(boolean fair) {
433	>	PublicSemaphore s = new PublicSemaphore(10, fair);
434	>	assertEquals(10, s.availablePermits());
435	>	s.reducePermits(0);
436	>	assertEquals(10, s.availablePermits());
437	>	s.reducePermits(1);
438	>	assertEquals(9, s.availablePermits());
439	>	s.reducePermits(10);
440	>	assertEquals(-1, s.availablePermits());
441	>	s.reducePermits(10);
442	>	assertEquals(-11, s.availablePermits());
443	>	s.reducePermits(0);
444	>	assertEquals(-11, s.availablePermits());
445		}
446
447		/**
448	<	* tryAcquire succeeds when sufficient permits, else fails
449	<	*/
450	<	public void testTryAcquireInSameThread_fair() {
451	<	Semaphore s = new Semaphore(2, true);
452	<	assertEquals(2, s.availablePermits());
453	<	assertTrue(s.tryAcquire());
454	<	assertTrue(s.tryAcquire());
455	<	assertEquals(0, s.availablePermits());
456	<	assertFalse(s.tryAcquire());
448	>	* a reserialized semaphore has same number of permits and
449	>	* fairness, but no queued threads
450	>	*/
451	>	public void testSerialization()      { testSerialization(false); }
452	>	public void testSerialization_fair() { testSerialization(true); }
453	>	public void testSerialization(boolean fair) {
454	>	try {
455	>	Semaphore s = new Semaphore(3, fair);
456	>	s.acquire();
457	>	s.acquire();
458	>	s.release();
459	>
460	>	Semaphore clone = serialClone(s);
461	>	assertEquals(fair, s.isFair());
462	>	assertEquals(fair, clone.isFair());
463	>	assertEquals(2, s.availablePermits());
464	>	assertEquals(2, clone.availablePermits());
465	>	clone.acquire();
466	>	clone.acquire();
467	>	clone.release();
468	>	assertEquals(2, s.availablePermits());
469	>	assertEquals(1, clone.availablePermits());
470	>
471	>	s = new Semaphore(0, fair);
472	>	Thread t = newStartedThread(new InterruptibleLockRunnable(s));
473	>	waitForQueuedThreads(s);
474	>	clone = serialClone(s);
475	>	assertEquals(fair, s.isFair());
476	>	assertEquals(fair, clone.isFair());
477	>	assertEquals(0, s.availablePermits());
478	>	assertEquals(0, clone.availablePermits());
479	>	assertTrue(s.hasQueuedThreads());
480	>	assertFalse(clone.hasQueuedThreads());
481	>	s.release();
482	>	awaitTermination(t);
483	>	assertFalse(s.hasQueuedThreads());
484	>	assertFalse(clone.hasQueuedThreads());
485	>	} catch (InterruptedException e) { threadUnexpectedException(e); }
486		}
487
488		/**
489		* tryAcquire(n) succeeds when sufficient permits, else fails
490		*/
491	<	public void testTryAcquireNInSameThread_fair() {
492	<	Semaphore s = new Semaphore(2, true);
491	>	public void testTryAcquireNInSameThread()      { testTryAcquireNInSameThread(false); }
492	>	public void testTryAcquireNInSameThread_fair() { testTryAcquireNInSameThread(true); }
493	>	public void testTryAcquireNInSameThread(boolean fair) {
494	>	Semaphore s = new Semaphore(2, fair);
495	>	assertEquals(2, s.availablePermits());
496	>	assertFalse(s.tryAcquire(3));
497		assertEquals(2, s.availablePermits());
498		assertTrue(s.tryAcquire(2));
499		assertEquals(0, s.availablePermits());
500	<	assertFalse(s.tryAcquire());
501	<	}
502	<
425	<	/**
426	<	* Acquire and release of semaphore succeed if initially available
427	<	*/
428	<	public void testAcquireReleaseInSameThread_fair()
429	<	throws InterruptedException {
430	<	Semaphore s = new Semaphore(1, true);
431	<	s.acquire();
432	<	s.release();
433	<	s.acquire();
434	<	s.release();
435	<	s.acquire();
436	<	s.release();
437	<	s.acquire();
438	<	s.release();
439	<	s.acquire();
440	<	s.release();
441	<	assertEquals(1, s.availablePermits());
442	<	}
443	<
444	<	/**
445	<	* Acquire(n) and release(n) of semaphore succeed if initially available
446	<	*/
447	<	public void testAcquireReleaseNInSameThread_fair()
448	<	throws InterruptedException {
449	<	Semaphore s = new Semaphore(1, true);
450	<	s.release(1);
451	<	s.acquire(1);
452	<	s.release(2);
453	<	s.acquire(2);
454	<	s.release(3);
455	<	s.acquire(3);
456	<	s.release(4);
457	<	s.acquire(4);
458	<	s.release(5);
459	<	s.acquire(5);
460	<	assertEquals(1, s.availablePermits());
461	<	}
462	<
463	<	/**
464	<	* Acquire(n) and release(n) of semaphore succeed if initially available
465	<	*/
466	<	public void testAcquireUninterruptiblyReleaseNInSameThread_fair() {
467	<	Semaphore s = new Semaphore(1, true);
468	<	s.release(1);
469	<	s.acquireUninterruptibly(1);
470	<	s.release(2);
471	<	s.acquireUninterruptibly(2);
472	<	s.release(3);
473	<	s.acquireUninterruptibly(3);
474	<	s.release(4);
475	<	s.acquireUninterruptibly(4);
476	<	s.release(5);
477	<	s.acquireUninterruptibly(5);
478	<	assertEquals(1, s.availablePermits());
479	<	}
480	<
481	<	/**
482	<	* release(n) in one thread enables timed acquire(n) in another thread
483	<	*/
484	<	public void testTimedAcquireReleaseNInSameThread_fair()
485	<	throws InterruptedException {
486	<	Semaphore s = new Semaphore(1, true);
487	<	s.release(1);
488	<	assertTrue(s.tryAcquire(1, SHORT_DELAY_MS, MILLISECONDS));
489	<	s.release(2);
490	<	assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
491	<	s.release(3);
492	<	assertTrue(s.tryAcquire(3, SHORT_DELAY_MS, MILLISECONDS));
493	<	s.release(4);
494	<	assertTrue(s.tryAcquire(4, SHORT_DELAY_MS, MILLISECONDS));
495	<	s.release(5);
496	<	assertTrue(s.tryAcquire(5, SHORT_DELAY_MS, MILLISECONDS));
497	<	assertEquals(1, s.availablePermits());
498	<	}
499	<
500	<	/**
501	<	* release in one thread enables timed acquire in another thread
502	<	*/
503	<	public void testTimedAcquireReleaseInSameThread_fair()
504	<	throws InterruptedException {
505	<	Semaphore s = new Semaphore(1, true);
506	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
507	<	s.release();
508	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
509	<	s.release();
510	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
511	<	s.release();
512	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
513	<	s.release();
514	<	assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
515	<	s.release();
516	<	assertEquals(1, s.availablePermits());
500	>	assertFalse(s.tryAcquire(1));
501	>	assertFalse(s.tryAcquire(2));
502	>	assertEquals(0, s.availablePermits());
503		}
504
505		/**
506	<	* A release in one thread enables an acquire in another thread
506	>	* acquire succeeds if permits available
507		*/
508	<	public void testAcquireReleaseInDifferentThreads_fair()
509	<	throws InterruptedException {
510	<	final Semaphore s = new Semaphore(0, true);
511	<	Thread t = new Thread(new CheckedRunnable() {
512	<	public void realRun() throws InterruptedException {
513	<	s.acquire();
514	<	s.acquire();
515	<	s.acquire();
516	<	s.acquire();
517	<	}});
518	<
519	<	t.start();
520	<	Thread.sleep(SHORT_DELAY_MS);
521	<	s.release();
522	<	s.release();
523	<	s.release();
524	<	s.release();
525	<	s.release();
526	<	s.release();
527	<	t.join();
528	<	assertEquals(2, s.availablePermits());
508	>	public void testReleaseAcquireSameThread_acquire()       { testReleaseAcquireSameThread(false, AcquireMethod.acquire); }
509	>	public void testReleaseAcquireSameThread_acquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquire); }
510	>	public void testReleaseAcquireSameThread_acquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireN); }
511	>	public void testReleaseAcquireSameThread_acquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireN); }
512	>	public void testReleaseAcquireSameThread_acquireUninterruptibly()       { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
513	>	public void testReleaseAcquireSameThread_acquireUninterruptibly_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
514	>	public void testReleaseAcquireSameThread_acquireUninterruptiblyN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
515	>	public void testReleaseAcquireSameThread_acquireUninterruptiblyN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
516	>	public void testReleaseAcquireSameThread_tryAcquire()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquire); }
517	>	public void testReleaseAcquireSameThread_tryAcquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquire); }
518	>	public void testReleaseAcquireSameThread_tryAcquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireN); }
519	>	public void testReleaseAcquireSameThread_tryAcquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireN); }
520	>	public void testReleaseAcquireSameThread_tryAcquireTimed()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimed); }
521	>	public void testReleaseAcquireSameThread_tryAcquireTimed_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimed); }
522	>	public void testReleaseAcquireSameThread_tryAcquireTimedN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimedN); }
523	>	public void testReleaseAcquireSameThread_tryAcquireTimedN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimedN); }
524	>	public void testReleaseAcquireSameThread(boolean fair,
525	>	final AcquireMethod acquirer) {
526	>	Semaphore s = new Semaphore(1, fair);
527	>	for (int i = 1; i < 6; i++) {
528	>	s.release(i);
529	>	assertEquals(1 + i, s.availablePermits());
530	>	try {
531	>	acquirer.acquire(s, i);
532	>	} catch (InterruptedException e) { threadUnexpectedException(e); }
533	>	assertEquals(1, s.availablePermits());
534	>	}
535		}
536
537		/**
538	<	* release(n) in one thread enables acquire(n) in another thread
538	>	* release in one thread enables acquire in another thread
539		*/
540	<	public void testAcquireReleaseNInDifferentThreads_fair()
541	<	throws InterruptedException {
542	<	final Semaphore s = new Semaphore(0, true);
543	<	Thread t = new Thread(new CheckedRunnable() {
544	<	public void realRun() throws InterruptedException {
545	<	s.acquire();
546	<	s.release(2);
547	<	s.acquire();
548	<	}});
549	<
550	<	t.start();
551	<	Thread.sleep(SHORT_DELAY_MS);
552	<	s.release(2);
553	<	s.acquire(2);
554	<	s.release(1);
555	<	t.join();
540	>	public void testReleaseAcquireDifferentThreads_acquire()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquire); }
541	>	public void testReleaseAcquireDifferentThreads_acquire_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquire); }
542	>	public void testReleaseAcquireDifferentThreads_acquireN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireN); }
543	>	public void testReleaseAcquireDifferentThreads_acquireN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireN); }
544	>	public void testReleaseAcquireDifferentThreads_acquireUninterruptibly()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
545	>	public void testReleaseAcquireDifferentThreads_acquireUninterruptibly_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
546	>	public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
547	>	public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
548	>	public void testReleaseAcquireDifferentThreads_tryAcquireTimed()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimed); }
549	>	public void testReleaseAcquireDifferentThreads_tryAcquireTimed_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimed); }
550	>	public void testReleaseAcquireDifferentThreads_tryAcquireTimedN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimedN); }
551	>	public void testReleaseAcquireDifferentThreads_tryAcquireTimedN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimedN); }
552	>	public void testReleaseAcquireDifferentThreads(boolean fair,
553	>	final AcquireMethod acquirer) {
554	>	final Semaphore s = new Semaphore(0, fair);
555	>	final int rounds = 4;
556	>	long startTime = System.nanoTime();
557	>	Thread t = newStartedThread(new CheckedRunnable() {
558	>	public void realRun() throws InterruptedException {
559	>	for (int i = 0; i < rounds; i++) {
560	>	assertFalse(s.hasQueuedThreads());
561	>	if (i % 2 == 0)
562	>	acquirer.acquire(s);
563	>	else
564	>	acquirer.acquire(s, 3);
565	>	}}});
566	>
567	>	for (int i = 0; i < rounds; i++) {
568	>	while (! (s.availablePermits() == 0 && s.hasQueuedThreads()))
569	>	Thread.yield();
570	>	assertTrue(t.isAlive());
571	>	if (i % 2 == 0)
572	>	s.release();
573	>	else
574	>	s.release(3);
575	>	}
576	>	awaitTermination(t);
577	>	assertEquals(0, s.availablePermits());
578	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
579		}
580
581		/**
582	<	* release(n) in one thread enables acquire(n) in another thread
582	>	* fair locks are strictly FIFO
583		*/
584	<	public void testAcquireReleaseNInDifferentThreads_fair2()
585	<	throws InterruptedException {
586	<	final Semaphore s = new Semaphore(0, true);
587	<	Thread t = new Thread(new CheckedRunnable() {
584	>	public void testFairLocksFifo() {
585	>	final PublicSemaphore s = new PublicSemaphore(1, true);
586	>	final CountDownLatch pleaseRelease = new CountDownLatch(1);
587	>	Thread t1 = newStartedThread(new CheckedRunnable() {
588		public void realRun() throws InterruptedException {
589	<	s.acquire(2);
590	<	s.acquire(2);
576	<	s.release(4);
589	>	// Will block; permits are available, but not three
590	>	s.acquire(3);
591		}});
592
593	<	t.start();
580	<	Thread.sleep(SHORT_DELAY_MS);
581	<	s.release(6);
582	<	s.acquire(2);
583	<	s.acquire(2);
584	<	s.release(2);
585	<	t.join();
586	<	}
587	<
593	>	waitForQueuedThreads(s);
594
595	<	/**
590	<	* release in one thread enables timed acquire in another thread
591	<	*/
592	<	public void testTimedAcquireReleaseInDifferentThreads_fair()
593	<	throws InterruptedException {
594	<	final Semaphore s = new Semaphore(1, true);
595	<	Thread t = new Thread(new CheckedRunnable() {
595	>	Thread t2 = newStartedThread(new CheckedRunnable() {
596		public void realRun() throws InterruptedException {
597	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
598	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
599	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
600	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
601	<	threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
602	<	}});
597	>	// Will fail, even though 1 permit is available
598	>	assertFalse(s.tryAcquire(0L, MILLISECONDS));
599	>	assertFalse(s.tryAcquire(1, 0L, MILLISECONDS));
600
601	<	t.start();
602	<	s.release();
606	<	s.release();
607	<	s.release();
608	<	s.release();
609	<	s.release();
610	<	t.join();
611	<	}
612	<
613	<	/**
614	<	* release(n) in one thread enables timed acquire(n) in another thread
615	<	*/
616	<	public void testTimedAcquireReleaseNInDifferentThreads_fair()
617	<	throws InterruptedException {
618	<	final Semaphore s = new Semaphore(2, true);
619	<	Thread t = new Thread(new CheckedRunnable() {
620	<	public void realRun() throws InterruptedException {
621	<	threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
601	>	// untimed tryAcquire will barge and succeed
602	>	assertTrue(s.tryAcquire());
603		s.release(2);
604	<	threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
605	<	s.release(2);
625	<	}});
626	<
627	<	t.start();
628	<	assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
629	<	s.release(2);
630	<	assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
631	<	s.release(2);
632	<	t.join();
633	<	}
604	>	assertTrue(s.tryAcquire(2));
605	>	s.release();
606
607	<	/**
608	<	* A waiting acquire blocks interruptibly
637	<	*/
638	<	public void testAcquire_InterruptedException_fair()
639	<	throws InterruptedException {
640	<	final Semaphore s = new Semaphore(0, true);
641	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
642	<	public void realRun() throws InterruptedException {
607	>	pleaseRelease.countDown();
608	>	// Will queue up behind t1, even though 1 permit is available
609		s.acquire();
610		}});
611
612	<	t.start();
613	<	Thread.sleep(SHORT_DELAY_MS);
614	<	t.interrupt();
615	<	t.join();
616	<	}
617	<
618	<	/**
653	<	* A waiting acquire(n) blocks interruptibly
654	<	*/
655	<	public void testAcquireN_InterruptedException_fair()
656	<	throws InterruptedException {
657	<	final Semaphore s = new Semaphore(2, true);
658	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
659	<	public void realRun() throws InterruptedException {
660	<	s.acquire(3);
661	<	}});
662	<
663	<	t.start();
664	<	Thread.sleep(SHORT_DELAY_MS);
665	<	t.interrupt();
666	<	t.join();
667	<	}
668	<
669	<	/**
670	<	*  A waiting tryAcquire blocks interruptibly
671	<	*/
672	<	public void testTryAcquire_InterruptedException_fair()
673	<	throws InterruptedException {
674	<	final Semaphore s = new Semaphore(0, true);
675	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
676	<	public void realRun() throws InterruptedException {
677	<	s.tryAcquire(MEDIUM_DELAY_MS, MILLISECONDS);
678	<	}});
679	<
680	<	t.start();
681	<	Thread.sleep(SHORT_DELAY_MS);
682	<	t.interrupt();
683	<	t.join();
684	<	}
685	<
686	<	/**
687	<	*  A waiting tryAcquire(n) blocks interruptibly
688	<	*/
689	<	public void testTryAcquireN_InterruptedException_fair()
690	<	throws InterruptedException {
691	<	final Semaphore s = new Semaphore(1, true);
692	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
693	<	public void realRun() throws InterruptedException {
694	<	s.tryAcquire(4, MEDIUM_DELAY_MS, MILLISECONDS);
695	<	}});
696	<
697	<	t.start();
698	<	Thread.sleep(SHORT_DELAY_MS);
699	<	t.interrupt();
700	<	t.join();
701	<	}
702	<
703	<	/**
704	<	* getQueueLength reports number of waiting threads
705	<	*/
706	<	public void testGetQueueLength_fair() throws InterruptedException {
707	<	final Semaphore lock = new Semaphore(1, true);
708	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
709	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
710	<	assertEquals(0, lock.getQueueLength());
711	<	lock.acquireUninterruptibly();
712	<	t1.start();
713	<	Thread.sleep(SHORT_DELAY_MS);
714	<	assertEquals(1, lock.getQueueLength());
715	<	t2.start();
716	<	Thread.sleep(SHORT_DELAY_MS);
717	<	assertEquals(2, lock.getQueueLength());
718	<	t1.interrupt();
719	<	Thread.sleep(SHORT_DELAY_MS);
720	<	assertEquals(1, lock.getQueueLength());
721	<	lock.release();
722	<	Thread.sleep(SHORT_DELAY_MS);
723	<	assertEquals(0, lock.getQueueLength());
724	<	t1.join();
725	<	t2.join();
726	<	}
727	<
728	<
729	<	/**
730	<	* a deserialized serialized semaphore has same number of permits
731	<	*/
732	<	public void testSerialization_fair() throws Exception {
733	<	Semaphore l = new Semaphore(3, true);
734	<
735	<	l.acquire();
736	<	l.release();
737	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
738	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
739	<	out.writeObject(l);
740	<	out.close();
741	<
742	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
743	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
744	<	Semaphore r = (Semaphore) in.readObject();
745	<	assertEquals(3, r.availablePermits());
746	<	assertTrue(r.isFair());
747	<	r.acquire();
748	<	r.release();
612	>	await(pleaseRelease);
613	>	waitForQueuedThread(s, t2);
614	>	s.release(2);
615	>	awaitTermination(t1);
616	>	assertTrue(t2.isAlive());
617	>	s.release();
618	>	awaitTermination(t2);
619		}
620
621		/**
622		* toString indicates current number of permits
623		*/
624	<	public void testToString() {
625	<	Semaphore s = new Semaphore(0);
626	<	String us = s.toString();
627	<	assertTrue(us.indexOf("Permits = 0") >= 0);
624	>	public void testToString()      { testToString(false); }
625	>	public void testToString_fair() { testToString(true); }
626	>	public void testToString(boolean fair) {
627	>	PublicSemaphore s = new PublicSemaphore(0, fair);
628	>	assertTrue(s.toString().contains("Permits = 0"));
629		s.release();
630	<	String s1 = s.toString();
631	<	assertTrue(s1.indexOf("Permits = 1") >= 0);
632	<	s.release();
633	<	String s2 = s.toString();
634	<	assertTrue(s2.indexOf("Permits = 2") >= 0);
630	>	assertTrue(s.toString().contains("Permits = 1"));
631	>	s.release(2);
632	>	assertTrue(s.toString().contains("Permits = 3"));
633	>	s.reducePermits(5);
634	>	assertTrue(s.toString().contains("Permits = -2"));
635		}
636
637		}

Diff Legend

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