ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/SemaphoreTest.java
(Generate patch)

Comparing jsr166/src/test/tck/SemaphoreTest.java (file contents):
Revision 1.6 by dl, Mon Nov 3 13:50:07 2003 UTC vs.
Revision 1.43 by jsr166, Tue Jan 23 20:44:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines