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.14 by dl, Sat Jan 10 01:41:59 2004 UTC vs.
Revision 1.38 by jsr166, Sun May 14 00:38:16 2017 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
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
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 >
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);
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 boolean hasQueuedThread(Thread t) {
37 >            return super.getQueuedThreads().contains(t);
38          }
39 <        public void reducePermits(int p) {
40 <            super.reducePermits(p);
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  
48
58      /**
59 <     * A runnable calling acquire that expects to be
51 <     * 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 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 >    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 >            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 <        assertFalse(s1.isFair());
163 <        Semaphore s2 = new Semaphore(-1, false);
75 <        assertEquals(-1, s2.availablePermits());
76 <        assertFalse(s2.isFair());
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 testConstructor2() {
170 <        Semaphore s0 = new Semaphore(0);
171 <        assertEquals(0, s0.availablePermits());
172 <        assertFalse(s0.isFair());
173 <        Semaphore s1 = new Semaphore(-1);
174 <        assertEquals(-1, s1.availablePermits());
88 <        assertFalse(s1.isFair());
89 <        Semaphore s2 = new Semaphore(-1);
90 <        assertEquals(-1, s2.availablePermits());
91 <        assertFalse(s2.isFair());
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 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()      { testTryAcquire_timeout(false); }
197 >    public void testTryAcquire_timeout_fair() { testTryAcquire_timeout(true); }
198 >    public void testTryAcquire_timeout(boolean fair) {
199 >        Semaphore s = new Semaphore(0, fair);
200 >        long startTime = System.nanoTime();
201 >        try { assertFalse(s.tryAcquire(timeoutMillis(), MILLISECONDS)); }
202 >        catch (InterruptedException e) { threadUnexpectedException(e); }
203 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
204 >    }
205 >
206 >    /**
207 >     * timed tryAcquire(N) times out
208 >     */
209 >    public void testTryAcquireN_timeout()      { testTryAcquireN_timeout(false); }
210 >    public void testTryAcquireN_timeout_fair() { testTryAcquireN_timeout(true); }
211 >    public void testTryAcquireN_timeout(boolean fair) {
212 >        Semaphore s = new Semaphore(2, fair);
213 >        long startTime = System.nanoTime();
214 >        try { assertFalse(s.tryAcquire(3, timeoutMillis(), MILLISECONDS)); }
215 >        catch (InterruptedException e) { threadUnexpectedException(e); }
216 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
217 >    }
218 >
219 >    /**
220 >     * acquire(), acquire(N), timed tryAcquired, timed tryAcquire(N)
221 >     * are interruptible
222 >     */
223 >    public void testInterruptible_acquire()               { testInterruptible(false, AcquireMethod.acquire); }
224 >    public void testInterruptible_acquire_fair()          { testInterruptible(true,  AcquireMethod.acquire); }
225 >    public void testInterruptible_acquireN()              { testInterruptible(false, AcquireMethod.acquireN); }
226 >    public void testInterruptible_acquireN_fair()         { testInterruptible(true,  AcquireMethod.acquireN); }
227 >    public void testInterruptible_tryAcquireTimed()       { testInterruptible(false, AcquireMethod.tryAcquireTimed); }
228 >    public void testInterruptible_tryAcquireTimed_fair()  { testInterruptible(true,  AcquireMethod.tryAcquireTimed); }
229 >    public void testInterruptible_tryAcquireTimedN()      { testInterruptible(false, AcquireMethod.tryAcquireTimedN); }
230 >    public void testInterruptible_tryAcquireTimedN_fair() { testInterruptible(true,  AcquireMethod.tryAcquireTimedN); }
231 >    public void testInterruptible(boolean fair, final AcquireMethod acquirer) {
232 >        final PublicSemaphore s = new PublicSemaphore(0, fair);
233 >        final java.util.concurrent.CyclicBarrier pleaseInterrupt
234 >            = new java.util.concurrent.CyclicBarrier(2);
235 >        Thread t = newStartedThread(new CheckedRunnable() {
236 >            public void realRun() {
237 >                // Interrupt before acquire
238 >                Thread.currentThread().interrupt();
239 >                try {
240 >                    acquirer.acquire(s);
241 >                    shouldThrow();
242 >                } catch (InterruptedException success) {}
243 >                assertFalse(Thread.interrupted());
244 >
245 >                // Interrupt before acquire(N)
246 >                Thread.currentThread().interrupt();
247 >                try {
248 >                    acquirer.acquire(s, 3);
249 >                    shouldThrow();
250 >                } catch (InterruptedException success) {}
251 >                assertFalse(Thread.interrupted());
252 >
253 >                // Interrupt during acquire
254 >                await(pleaseInterrupt);
255 >                try {
256 >                    acquirer.acquire(s);
257 >                    shouldThrow();
258 >                } catch (InterruptedException success) {}
259 >                assertFalse(Thread.interrupted());
260 >
261 >                // Interrupt during acquire(N)
262 >                await(pleaseInterrupt);
263 >                try {
264 >                    acquirer.acquire(s, 3);
265 >                    shouldThrow();
266 >                } catch (InterruptedException success) {}
267 >                assertFalse(Thread.interrupted());
268 >            }});
269 >
270 >        for (int n = 2; n-->0; ) {
271 >            await(pleaseInterrupt);
272 >            assertThreadBlocks(t, acquirer.parkedState());
273 >            t.interrupt();
274          }
275 +        
276 +        awaitTermination(t);
277      }
278  
279      /**
280 <     * Uninterruptible acquire and release of semaphore succeed if
281 <     * initially available
280 >     * acquireUninterruptibly(), acquireUninterruptibly(N) are
281 >     * uninterruptible
282       */
283 <    public void testAcquireUninterruptiblyReleaseInSameThread() {
284 <        Semaphore s = new Semaphore(1, false);
285 <        try {
286 <            s.acquireUninterruptibly();
287 <            s.release();
288 <            s.acquireUninterruptibly();
289 <            s.release();
290 <            s.acquireUninterruptibly();
291 <            s.release();
292 <            s.acquireUninterruptibly();
293 <            s.release();
294 <            s.acquireUninterruptibly();
295 <            s.release();
296 <            assertEquals(1, s.availablePermits());
297 <        } finally {
298 <        }
299 <    }
283 >    public void testUninterruptible_acquireUninterruptibly()       { testUninterruptible(false, AcquireMethod.acquireUninterruptibly); }
284 >    public void testUninterruptible_acquireUninterruptibly_fair()  { testUninterruptible(true,  AcquireMethod.acquireUninterruptibly); }
285 >    public void testUninterruptible_acquireUninterruptiblyN()      { testUninterruptible(false, AcquireMethod.acquireUninterruptiblyN); }
286 >    public void testUninterruptible_acquireUninterruptiblyN_fair() { testUninterruptible(true,  AcquireMethod.acquireUninterruptiblyN); }
287 >    public void testUninterruptible(boolean fair, final AcquireMethod acquirer) {
288 >        final PublicSemaphore s = new PublicSemaphore(0, fair);
289 >        final Semaphore pleaseInterrupt = new Semaphore(-1, fair);
290 >
291 >        Thread t1 = newStartedThread(new CheckedRunnable() {
292 >            public void realRun() throws InterruptedException {
293 >                // Interrupt before acquire
294 >                pleaseInterrupt.release();
295 >                Thread.currentThread().interrupt();
296 >                acquirer.acquire(s);
297 >                assertTrue(Thread.interrupted());
298 >            }});
299 >
300 >        Thread t2 = newStartedThread(new CheckedRunnable() {
301 >            public void realRun() throws InterruptedException {
302 >                // Interrupt during acquire
303 >                pleaseInterrupt.release();
304 >                acquirer.acquire(s);
305 >                assertTrue(Thread.interrupted());
306 >            }});
307 >
308 >        await(pleaseInterrupt);
309 >        waitForQueuedThread(s, t1);
310 >        waitForQueuedThread(s, t2);
311 >        t2.interrupt();
312  
313 <    /**
314 <     * Timed Acquire and release of semaphore succeed if
152 <     * initially available
153 <     */
154 <    public void testTimedAcquireReleaseInSameThread() {
155 <        Semaphore s = new Semaphore(1, false);
156 <        try {
157 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
158 <            s.release();
159 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
160 <            s.release();
161 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
162 <            s.release();
163 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
164 <            s.release();
165 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
166 <            s.release();
167 <            assertEquals(1, s.availablePermits());
168 <        } catch( InterruptedException e){
169 <            unexpectedException();
170 <        }
171 <    }
313 >        assertThreadBlocks(t1, Thread.State.WAITING);
314 >        assertThreadBlocks(t2, Thread.State.WAITING);
315  
316 <    /**
174 <     * A release in one thread enables an acquire in another thread
175 <     */
176 <    public void testAcquireReleaseInDifferentThreads() {
177 <        final Semaphore s = new Semaphore(0, false);
178 <        Thread t = new Thread(new Runnable() {
179 <                public void run() {
180 <                    try {
181 <                        s.acquire();
182 <                        s.release();
183 <                        s.release();
184 <                        s.acquire();
185 <                    } catch(InterruptedException ie){
186 <                        threadUnexpectedException();
187 <                    }
188 <                }
189 <            });
190 <        try {
191 <            t.start();
192 <            Thread.sleep(SHORT_DELAY_MS);
193 <            s.release();
194 <            s.release();
195 <            s.acquire();
196 <            s.acquire();
197 <            s.release();
198 <            t.join();
199 <        } catch( InterruptedException e){
200 <            unexpectedException();
201 <        }
202 <    }
316 >        s.release(2);
317  
318 <    /**
319 <     * A release in one thread enables an uninterruptible acquire in another thread
206 <     */
207 <    public void testUninterruptibleAcquireReleaseInDifferentThreads() {
208 <        final Semaphore s = new Semaphore(0, false);
209 <        Thread t = new Thread(new Runnable() {
210 <                public void run() {
211 <                    s.acquireUninterruptibly();
212 <                    s.release();
213 <                    s.release();
214 <                    s.acquireUninterruptibly();
215 <                }
216 <            });
217 <        try {
218 <            t.start();
219 <            Thread.sleep(SHORT_DELAY_MS);
220 <            s.release();
221 <            s.release();
222 <            s.acquireUninterruptibly();
223 <            s.acquireUninterruptibly();
224 <            s.release();
225 <            t.join();
226 <        } catch( InterruptedException e){
227 <            unexpectedException();
228 <        }
229 <    }
230 <
231 <
232 <    /**
233 <     *  A release in one thread enables a timed acquire in another thread
234 <     */
235 <    public void testTimedAcquireReleaseInDifferentThreads() {
236 <        final Semaphore s = new Semaphore(1, false);
237 <        Thread t = new Thread(new Runnable() {
238 <                public void run() {
239 <                    try {
240 <                        s.release();
241 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
242 <                        s.release();
243 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
244 <
245 <                    } catch(InterruptedException ie){
246 <                        threadUnexpectedException();
247 <                    }
248 <                }
249 <            });
250 <        try {
251 <            t.start();
252 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
253 <            s.release();
254 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
255 <            s.release();
256 <            s.release();
257 <            t.join();
258 <        } catch( InterruptedException e){
259 <            unexpectedException();
260 <        }
261 <    }
262 <
263 <    /**
264 <     * A waiting acquire blocks interruptibly
265 <     */
266 <    public void testAcquire_InterruptedException() {
267 <        final Semaphore s = new Semaphore(0, false);
268 <        Thread t = new Thread(new Runnable() {
269 <                public void run() {
270 <                    try {
271 <                        s.acquire();
272 <                        threadShouldThrow();
273 <                    } catch(InterruptedException success){}
274 <                }
275 <            });
276 <        t.start();
277 <        try {
278 <            Thread.sleep(SHORT_DELAY_MS);
279 <            t.interrupt();
280 <            t.join();
281 <        } catch(InterruptedException e){
282 <            unexpectedException();
283 <        }
284 <    }
285 <    
286 <    /**
287 <     *  A waiting timed acquire blocks interruptibly
288 <     */
289 <    public void testTryAcquire_InterruptedException() {
290 <        final Semaphore s = new Semaphore(0, false);
291 <        Thread t = new Thread(new Runnable() {
292 <                public void run() {
293 <                    try {
294 <                        s.tryAcquire(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
295 <                        threadShouldThrow();
296 <                    } catch(InterruptedException success){
297 <                    }
298 <                }
299 <            });
300 <        t.start();
301 <        try {
302 <            Thread.sleep(SHORT_DELAY_MS);
303 <            t.interrupt();
304 <            t.join();
305 <        } catch(InterruptedException e){
306 <            unexpectedException();
307 <        }
318 >        awaitTermination(t1);
319 >        awaitTermination(t2);
320      }
321  
322      /**
323       * hasQueuedThreads reports whether there are waiting threads
324       */
325 <    public void testHasQueuedThreads() {
326 <        final Semaphore lock = new Semaphore(1, false);
327 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
328 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
329 <        try {
330 <            assertFalse(lock.hasQueuedThreads());
331 <            lock.acquireUninterruptibly();
332 <            t1.start();
333 <            Thread.sleep(SHORT_DELAY_MS);
334 <            assertTrue(lock.hasQueuedThreads());
335 <            t2.start();
336 <            Thread.sleep(SHORT_DELAY_MS);
337 <            assertTrue(lock.hasQueuedThreads());
338 <            t1.interrupt();
339 <            Thread.sleep(SHORT_DELAY_MS);
340 <            assertTrue(lock.hasQueuedThreads());
341 <            lock.release();
342 <            Thread.sleep(SHORT_DELAY_MS);
343 <            assertFalse(lock.hasQueuedThreads());
332 <            t1.join();
333 <            t2.join();
334 <        } catch(Exception e){
335 <            unexpectedException();
336 <        }
337 <    }
325 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
326 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
327 >    public void testHasQueuedThreads(boolean fair) {
328 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
329 >        assertFalse(lock.hasQueuedThreads());
330 >        lock.acquireUninterruptibly();
331 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
332 >        waitForQueuedThread(lock, t1);
333 >        assertTrue(lock.hasQueuedThreads());
334 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
335 >        waitForQueuedThread(lock, t2);
336 >        assertTrue(lock.hasQueuedThreads());
337 >        t1.interrupt();
338 >        awaitTermination(t1);
339 >        assertTrue(lock.hasQueuedThreads());
340 >        lock.release();
341 >        awaitTermination(t2);
342 >        assertFalse(lock.hasQueuedThreads());
343 >    }
344  
345      /**
346       * getQueueLength reports number of waiting threads
347       */
348 <    public void testGetQueueLength() {
349 <        final Semaphore lock = new Semaphore(1, false);
350 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
351 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
352 <        try {
353 <            assertEquals(0, lock.getQueueLength());
354 <            lock.acquireUninterruptibly();
355 <            t1.start();
356 <            Thread.sleep(SHORT_DELAY_MS);
357 <            assertEquals(1, lock.getQueueLength());
358 <            t2.start();
359 <            Thread.sleep(SHORT_DELAY_MS);
360 <            assertEquals(2, lock.getQueueLength());
361 <            t1.interrupt();
362 <            Thread.sleep(SHORT_DELAY_MS);
363 <            assertEquals(1, lock.getQueueLength());
364 <            lock.release();
365 <            Thread.sleep(SHORT_DELAY_MS);
366 <            assertEquals(0, lock.getQueueLength());
361 <            t1.join();
362 <            t2.join();
363 <        } catch(Exception e){
364 <            unexpectedException();
365 <        }
366 <    }
348 >    public void testGetQueueLength()      { testGetQueueLength(false); }
349 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
350 >    public void testGetQueueLength(boolean fair) {
351 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
352 >        assertEquals(0, lock.getQueueLength());
353 >        lock.acquireUninterruptibly();
354 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
355 >        waitForQueuedThread(lock, t1);
356 >        assertEquals(1, lock.getQueueLength());
357 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
358 >        waitForQueuedThread(lock, t2);
359 >        assertEquals(2, lock.getQueueLength());
360 >        t1.interrupt();
361 >        awaitTermination(t1);
362 >        assertEquals(1, lock.getQueueLength());
363 >        lock.release();
364 >        awaitTermination(t2);
365 >        assertEquals(0, lock.getQueueLength());
366 >    }
367  
368      /**
369       * getQueuedThreads includes waiting threads
370       */
371 <    public void testGetQueuedThreads() {
372 <        final PublicSemaphore lock = new PublicSemaphore(1, false);
373 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
374 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
375 <        try {
376 <            assertTrue(lock.getQueuedThreads().isEmpty());
377 <            lock.acquireUninterruptibly();
378 <            assertTrue(lock.getQueuedThreads().isEmpty());
379 <            t1.start();
380 <            Thread.sleep(SHORT_DELAY_MS);
381 <            assertTrue(lock.getQueuedThreads().contains(t1));
382 <            t2.start();
383 <            Thread.sleep(SHORT_DELAY_MS);
384 <            assertTrue(lock.getQueuedThreads().contains(t1));
385 <            assertTrue(lock.getQueuedThreads().contains(t2));
386 <            t1.interrupt();
387 <            Thread.sleep(SHORT_DELAY_MS);
388 <            assertFalse(lock.getQueuedThreads().contains(t1));
389 <            assertTrue(lock.getQueuedThreads().contains(t2));
390 <            lock.release();
391 <            Thread.sleep(SHORT_DELAY_MS);
392 <            assertTrue(lock.getQueuedThreads().isEmpty());
393 <            t1.join();
394 <            t2.join();
395 <        } catch(Exception e){
396 <            unexpectedException();
397 <        }
398 <    }
371 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
372 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
373 >    public void testGetQueuedThreads(boolean fair) {
374 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
375 >        assertTrue(lock.getQueuedThreads().isEmpty());
376 >        lock.acquireUninterruptibly();
377 >        assertTrue(lock.getQueuedThreads().isEmpty());
378 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
379 >        waitForQueuedThread(lock, t1);
380 >        assertTrue(lock.getQueuedThreads().contains(t1));
381 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
382 >        waitForQueuedThread(lock, t2);
383 >        assertTrue(lock.getQueuedThreads().contains(t1));
384 >        assertTrue(lock.getQueuedThreads().contains(t2));
385 >        t1.interrupt();
386 >        awaitTermination(t1);
387 >        assertFalse(lock.getQueuedThreads().contains(t1));
388 >        assertTrue(lock.getQueuedThreads().contains(t2));
389 >        lock.release();
390 >        awaitTermination(t2);
391 >        assertTrue(lock.getQueuedThreads().isEmpty());
392 >    }
393  
394      /**
395       * drainPermits reports and removes given number of permits
396       */
397 <    public void testDrainPermits() {
398 <        Semaphore s = new Semaphore(0, false);
397 >    public void testDrainPermits()      { testDrainPermits(false); }
398 >    public void testDrainPermits_fair() { testDrainPermits(true); }
399 >    public void testDrainPermits(boolean fair) {
400 >        Semaphore s = new Semaphore(0, fair);
401          assertEquals(0, s.availablePermits());
402          assertEquals(0, s.drainPermits());
403          s.release(10);
# Line 412 | Line 408 | public class SemaphoreTest extends JSR16
408      }
409  
410      /**
411 <     * reducePermits reduces number of permits
411 >     * release(-N) throws IllegalArgumentException
412       */
413 <    public void testReducePermits() {
414 <        PublicSemaphore s = new PublicSemaphore(10, false);
415 <        assertEquals(10, s.availablePermits());
416 <        s.reducePermits(1);
421 <        assertEquals(9, s.availablePermits());
422 <        s.reducePermits(10);
423 <        assertEquals(-1, s.availablePermits());
424 <    }
425 <
426 <    /**
427 <     * a deserialized serialized semaphore has same number of permits
428 <     */
429 <    public void testSerialization() {
430 <        Semaphore l = new Semaphore(3, false);
413 >    public void testReleaseIAE()      { testReleaseIAE(false); }
414 >    public void testReleaseIAE_fair() { testReleaseIAE(true); }
415 >    public void testReleaseIAE(boolean fair) {
416 >        Semaphore s = new Semaphore(10, fair);
417          try {
418 <            l.acquire();
419 <            l.release();
420 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
435 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
436 <            out.writeObject(l);
437 <            out.close();
438 <
439 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
440 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
441 <            Semaphore r = (Semaphore) in.readObject();
442 <            assertEquals(3, r.availablePermits());
443 <            assertFalse(r.isFair());
444 <            r.acquire();
445 <            r.release();
446 <        } catch(Exception e){
447 <            unexpectedException();
448 <        }
449 <    }
450 <
451 <
452 <    /**
453 <     * Zero, negative, and positive initial values are allowed in constructor
454 <     */
455 <    public void testConstructor_fair() {
456 <        Semaphore s0 = new Semaphore(0, true);
457 <        assertEquals(0, s0.availablePermits());
458 <        assertTrue(s0.isFair());
459 <        Semaphore s1 = new Semaphore(-1, true);
460 <        assertEquals(-1, s1.availablePermits());
461 <        Semaphore s2 = new Semaphore(-1, true);
462 <        assertEquals(-1, s2.availablePermits());
418 >            s.release(-1);
419 >            shouldThrow();
420 >        } catch (IllegalArgumentException success) {}
421      }
422  
423      /**
424 <     * tryAcquire succeeds when sufficient permits, else fails
424 >     * reducePermits(-N) throws IllegalArgumentException
425       */
426 <    public void testTryAcquireInSameThread_fair() {
427 <        Semaphore s = new Semaphore(2, true);
428 <        assertEquals(2, s.availablePermits());
429 <        assertTrue(s.tryAcquire());
430 <        assertTrue(s.tryAcquire());
431 <        assertEquals(0, s.availablePermits());
432 <        assertFalse(s.tryAcquire());
426 >    public void testReducePermitsIAE()      { testReducePermitsIAE(false); }
427 >    public void testReducePermitsIAE_fair() { testReducePermitsIAE(true); }
428 >    public void testReducePermitsIAE(boolean fair) {
429 >        PublicSemaphore s = new PublicSemaphore(10, fair);
430 >        try {
431 >            s.reducePermits(-1);
432 >            shouldThrow();
433 >        } catch (IllegalArgumentException success) {}
434      }
435  
436      /**
437 <     * tryAcquire(n) succeeds when sufficient permits, else fails
437 >     * reducePermits reduces number of permits
438       */
439 <    public void testTryAcquireNInSameThread_fair() {
440 <        Semaphore s = new Semaphore(2, true);
441 <        assertEquals(2, s.availablePermits());
442 <        assertTrue(s.tryAcquire(2));
443 <        assertEquals(0, s.availablePermits());
444 <        assertFalse(s.tryAcquire());
439 >    public void testReducePermits()      { testReducePermits(false); }
440 >    public void testReducePermits_fair() { testReducePermits(true); }
441 >    public void testReducePermits(boolean fair) {
442 >        PublicSemaphore s = new PublicSemaphore(10, fair);
443 >        assertEquals(10, s.availablePermits());
444 >        s.reducePermits(0);
445 >        assertEquals(10, s.availablePermits());
446 >        s.reducePermits(1);
447 >        assertEquals(9, s.availablePermits());
448 >        s.reducePermits(10);
449 >        assertEquals(-1, s.availablePermits());
450 >        s.reducePermits(10);
451 >        assertEquals(-11, s.availablePermits());
452 >        s.reducePermits(0);
453 >        assertEquals(-11, s.availablePermits());
454      }
455  
456      /**
457 <     * Acquire and release of semaphore succeed if initially available
457 >     * a reserialized semaphore has same number of permits and
458 >     * fairness, but no queued threads
459       */
460 <    public void testAcquireReleaseInSameThread_fair() {
461 <        Semaphore s = new Semaphore(1, true);
460 >    public void testSerialization()      { testSerialization(false); }
461 >    public void testSerialization_fair() { testSerialization(true); }
462 >    public void testSerialization(boolean fair) {
463          try {
464 +            Semaphore s = new Semaphore(3, fair);
465              s.acquire();
495            s.release();
466              s.acquire();
467              s.release();
498            s.acquire();
499            s.release();
500            s.acquire();
501            s.release();
502            s.acquire();
503            s.release();
504            assertEquals(1, s.availablePermits());
505        } catch( InterruptedException e){
506            unexpectedException();
507        }
508    }
509
510    /**
511     * Acquire(n) and release(n) of semaphore succeed if initially available
512     */
513    public void testAcquireReleaseNInSameThread_fair() {
514        Semaphore s = new Semaphore(1, true);
515        try {
516            s.release(1);
517            s.acquire(1);
518            s.release(2);
519            s.acquire(2);
520            s.release(3);
521            s.acquire(3);
522            s.release(4);
523            s.acquire(4);
524            s.release(5);
525            s.acquire(5);
526            assertEquals(1, s.availablePermits());
527        } catch( InterruptedException e){
528            unexpectedException();
529        }
530    }
468  
469 <    /**
470 <     * Acquire(n) and release(n) of semaphore succeed if initially available
471 <     */
472 <    public void testAcquireUninterruptiblyReleaseNInSameThread_fair() {
473 <        Semaphore s = new Semaphore(1, true);
474 <        try {
475 <            s.release(1);
476 <            s.acquireUninterruptibly(1);
477 <            s.release(2);
478 <            s.acquireUninterruptibly(2);
479 <            s.release(3);
480 <            s.acquireUninterruptibly(3);
481 <            s.release(4);
482 <            s.acquireUninterruptibly(4);
483 <            s.release(5);
484 <            s.acquireUninterruptibly(5);
485 <            assertEquals(1, s.availablePermits());
486 <        } finally {
469 >            Semaphore clone = serialClone(s);
470 >            assertEquals(fair, s.isFair());
471 >            assertEquals(fair, clone.isFair());
472 >            assertEquals(2, s.availablePermits());
473 >            assertEquals(2, clone.availablePermits());
474 >            clone.acquire();
475 >            clone.acquire();
476 >            clone.release();
477 >            assertEquals(2, s.availablePermits());
478 >            assertEquals(1, clone.availablePermits());
479 >            assertFalse(s.hasQueuedThreads());
480 >            assertFalse(clone.hasQueuedThreads());
481 >        } catch (InterruptedException e) { threadUnexpectedException(e); }
482 >
483 >        {
484 >            PublicSemaphore s = new PublicSemaphore(0, fair);
485 >            Thread t = newStartedThread(new InterruptibleLockRunnable(s));
486 >            // waitForQueuedThreads(s); // suffers from "flicker", so ...
487 >            waitForQueuedThread(s, t);  // ... we use this instead
488 >            PublicSemaphore clone = serialClone(s);
489 >            assertEquals(fair, s.isFair());
490 >            assertEquals(fair, clone.isFair());
491 >            assertEquals(0, s.availablePermits());
492 >            assertEquals(0, clone.availablePermits());
493 >            assertTrue(s.hasQueuedThreads());
494 >            assertFalse(clone.hasQueuedThreads());
495 >            s.release();
496 >            awaitTermination(t);
497 >            assertFalse(s.hasQueuedThreads());
498 >            assertFalse(clone.hasQueuedThreads());
499          }
500      }
501  
502      /**
503 <     * release(n) in one thread enables timed acquire(n) in another thread
503 >     * tryAcquire(n) succeeds when sufficient permits, else fails
504       */
505 <    public void testTimedAcquireReleaseNInSameThread_fair() {
506 <        Semaphore s = new Semaphore(1, true);
507 <        try {
508 <            s.release(1);
509 <            assertTrue(s.tryAcquire(1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
510 <            s.release(2);
511 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
512 <            s.release(3);
513 <            assertTrue(s.tryAcquire(3, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
514 <            s.release(4);
515 <            assertTrue(s.tryAcquire(4, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
516 <            s.release(5);
568 <            assertTrue(s.tryAcquire(5, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
569 <            assertEquals(1, s.availablePermits());
570 <        } catch( InterruptedException e){
571 <            unexpectedException();
572 <        }
505 >    public void testTryAcquireNInSameThread()      { testTryAcquireNInSameThread(false); }
506 >    public void testTryAcquireNInSameThread_fair() { testTryAcquireNInSameThread(true); }
507 >    public void testTryAcquireNInSameThread(boolean fair) {
508 >        Semaphore s = new Semaphore(2, fair);
509 >        assertEquals(2, s.availablePermits());
510 >        assertFalse(s.tryAcquire(3));
511 >        assertEquals(2, s.availablePermits());
512 >        assertTrue(s.tryAcquire(2));
513 >        assertEquals(0, s.availablePermits());
514 >        assertFalse(s.tryAcquire(1));
515 >        assertFalse(s.tryAcquire(2));
516 >        assertEquals(0, s.availablePermits());
517      }
518  
519      /**
520 <     * release in one thread enables timed acquire in another thread
520 >     * acquire succeeds if permits available
521       */
522 <    public void testTimedAcquireReleaseInSameThread_fair() {
523 <        Semaphore s = new Semaphore(1, true);
524 <        try {
525 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
526 <            s.release();
527 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
528 <            s.release();
529 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
530 <            s.release();
531 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
532 <            s.release();
533 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
534 <            s.release();
522 >    public void testReleaseAcquireSameThread_acquire()       { testReleaseAcquireSameThread(false, AcquireMethod.acquire); }
523 >    public void testReleaseAcquireSameThread_acquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquire); }
524 >    public void testReleaseAcquireSameThread_acquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireN); }
525 >    public void testReleaseAcquireSameThread_acquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireN); }
526 >    public void testReleaseAcquireSameThread_acquireUninterruptibly()       { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
527 >    public void testReleaseAcquireSameThread_acquireUninterruptibly_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
528 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
529 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
530 >    public void testReleaseAcquireSameThread_tryAcquire()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquire); }
531 >    public void testReleaseAcquireSameThread_tryAcquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquire); }
532 >    public void testReleaseAcquireSameThread_tryAcquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireN); }
533 >    public void testReleaseAcquireSameThread_tryAcquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireN); }
534 >    public void testReleaseAcquireSameThread_tryAcquireTimed()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimed); }
535 >    public void testReleaseAcquireSameThread_tryAcquireTimed_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimed); }
536 >    public void testReleaseAcquireSameThread_tryAcquireTimedN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimedN); }
537 >    public void testReleaseAcquireSameThread_tryAcquireTimedN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimedN); }
538 >    public void testReleaseAcquireSameThread(boolean fair,
539 >                                             final AcquireMethod acquirer) {
540 >        Semaphore s = new Semaphore(1, fair);
541 >        for (int i = 1; i < 6; i++) {
542 >            s.release(i);
543 >            assertEquals(1 + i, s.availablePermits());
544 >            try {
545 >                acquirer.acquire(s, i);
546 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
547              assertEquals(1, s.availablePermits());
592        } catch( InterruptedException e){
593            unexpectedException();
548          }
549      }
550  
551      /**
552 <     * A release in one thread enables an acquire in another thread
552 >     * release in one thread enables acquire in another thread
553       */
554 <    public void testAcquireReleaseInDifferentThreads_fair() {
555 <        final Semaphore s = new Semaphore(0, true);
556 <        Thread t = new Thread(new Runnable() {
557 <                public void run() {
558 <                    try {
559 <                        s.acquire();
560 <                        s.acquire();
561 <                        s.acquire();
562 <                        s.acquire();
563 <                    } catch(InterruptedException ie){
564 <                        threadUnexpectedException();
565 <                    }
566 <                }
567 <            });
568 <        try {
569 <            t.start();
570 <            Thread.sleep(SHORT_DELAY_MS);
571 <            s.release();
572 <            s.release();
573 <            s.release();
574 <            s.release();
575 <            s.release();
576 <            s.release();
577 <            t.join();
578 <            assertEquals(2, s.availablePermits());
579 <        } catch( InterruptedException e){
580 <            unexpectedException();
581 <        }
582 <    }
583 <
584 <    /**
585 <     * release(n) in one thread enables acquire(n) in another thread
586 <     */
587 <    public void testAcquireReleaseNInDifferentThreads_fair() {
588 <        final Semaphore s = new Semaphore(0, true);
635 <        Thread t = new Thread(new Runnable() {
636 <                public void run() {
637 <                    try {
638 <                        s.acquire();
639 <                        s.release(2);
640 <                        s.acquire();
641 <                    } catch(InterruptedException ie){
642 <                        threadUnexpectedException();
643 <                    }
644 <                }
645 <            });
646 <        try {
647 <            t.start();
648 <            Thread.sleep(SHORT_DELAY_MS);
649 <            s.release(2);
650 <            s.acquire(2);
651 <            s.release(1);
652 <            t.join();
653 <        } catch( InterruptedException e){
654 <            unexpectedException();
655 <        }
656 <    }
657 <
658 <    /**
659 <     * release(n) in one thread enables acquire(n) in another thread
660 <     */
661 <    public void testAcquireReleaseNInDifferentThreads_fair2() {
662 <        final Semaphore s = new Semaphore(0, true);
663 <        Thread t = new Thread(new Runnable() {
664 <                public void run() {
665 <                    try {
666 <                        s.acquire(2);
667 <                        s.acquire(2);
668 <                        s.release(4);
669 <                    } catch(InterruptedException ie){
670 <                        threadUnexpectedException();
671 <                    }
672 <                }
673 <            });
674 <        try {
675 <            t.start();
676 <            Thread.sleep(SHORT_DELAY_MS);
677 <            s.release(6);
678 <            s.acquire(2);
679 <            s.acquire(2);
680 <            s.release(2);
681 <            t.join();
682 <        } catch( InterruptedException e){
683 <            unexpectedException();
684 <        }
685 <    }
686 <
687 <
688 <
689 <
690 <
691 <    /**
692 <     * release in one thread enables timed acquire in another thread
693 <     */
694 <    public void testTimedAcquireReleaseInDifferentThreads_fair() {
695 <        final Semaphore s = new Semaphore(1, true);
696 <        Thread t = new Thread(new Runnable() {
697 <                public void run() {
698 <                    try {
699 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
700 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
701 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
702 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
703 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
704 <
705 <                    } catch(InterruptedException ie){
706 <                        threadUnexpectedException();
707 <                    }
708 <                }
709 <            });
710 <        t.start();
711 <        try {
712 <            s.release();
713 <            s.release();
714 <            s.release();
715 <            s.release();
716 <            s.release();
717 <            t.join();
718 <        } catch( InterruptedException e){
719 <            unexpectedException();
720 <        }
721 <    }
722 <
723 <    /**
724 <     * release(n) in one thread enables timed acquire(n) in another thread
725 <     */
726 <    public void testTimedAcquireReleaseNInDifferentThreads_fair() {
727 <        final Semaphore s = new Semaphore(2, true);
728 <        Thread t = new Thread(new Runnable() {
729 <                public void run() {
730 <                    try {
731 <                        threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
732 <                        s.release(2);
733 <                        threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
734 <                        s.release(2);
735 <                    } catch(InterruptedException ie){
736 <                        threadUnexpectedException();
737 <                    }
738 <                }
739 <            });
740 <        t.start();
741 <        try {
742 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
743 <            s.release(2);
744 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
745 <            s.release(2);
746 <            t.join();
747 <        } catch( InterruptedException e){
748 <            unexpectedException();
749 <        }
750 <    }
751 <
752 <    /**
753 <     * A waiting acquire blocks interruptibly
754 <     */
755 <    public void testAcquire_InterruptedException_fair() {
756 <        final Semaphore s = new Semaphore(0, true);
757 <        Thread t = new Thread(new Runnable() {
758 <                public void run() {
759 <                    try {
760 <                        s.acquire();
761 <                        threadShouldThrow();
762 <                    } catch(InterruptedException success){}
763 <                }
764 <            });
765 <        t.start();
766 <        try {
767 <            Thread.sleep(SHORT_DELAY_MS);
768 <            t.interrupt();
769 <            t.join();
770 <        } catch(InterruptedException e){
771 <            unexpectedException();
772 <        }
773 <    }
774 <
775 <    /**
776 <     * A waiting acquire(n) blocks interruptibly
777 <     */
778 <    public void testAcquireN_InterruptedException_fair() {
779 <        final Semaphore s = new Semaphore(2, true);
780 <        Thread t = new Thread(new Runnable() {
781 <                public void run() {
782 <                    try {
783 <                        s.acquire(3);
784 <                        threadShouldThrow();
785 <                    } catch(InterruptedException success){}
786 <                }
787 <            });
788 <        t.start();
789 <        try {
790 <            Thread.sleep(SHORT_DELAY_MS);
791 <            t.interrupt();
792 <            t.join();
793 <        } catch(InterruptedException e){
794 <            unexpectedException();
795 <        }
796 <    }
797 <    
798 <    /**
799 <     *  A waiting tryAcquire blocks interruptibly
800 <     */
801 <    public void testTryAcquire_InterruptedException_fair() {
802 <        final Semaphore s = new Semaphore(0, true);
803 <        Thread t = new Thread(new Runnable() {
804 <                public void run() {
805 <                    try {
806 <                        s.tryAcquire(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
807 <                        threadShouldThrow();
808 <                    } catch(InterruptedException success){
809 <                    }
810 <                }
811 <            });
812 <        t.start();
813 <        try {
814 <            Thread.sleep(SHORT_DELAY_MS);
815 <            t.interrupt();
816 <            t.join();
817 <        } catch(InterruptedException e){
818 <            unexpectedException();
819 <        }
820 <    }
821 <
822 <    /**
823 <     *  A waiting tryAcquire(n) blocks interruptibly
824 <     */
825 <    public void testTryAcquireN_InterruptedException_fair() {
826 <        final Semaphore s = new Semaphore(1, true);
827 <        Thread t = new Thread(new Runnable() {
828 <                public void run() {
829 <                    try {
830 <                        s.tryAcquire(4, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
831 <                        threadShouldThrow();
832 <                    } catch(InterruptedException success){
833 <                    }
834 <                }
835 <            });
836 <        t.start();
837 <        try {
838 <            Thread.sleep(SHORT_DELAY_MS);
839 <            t.interrupt();
840 <            t.join();
841 <        } catch(InterruptedException e){
842 <            unexpectedException();
554 >    public void testReleaseAcquireDifferentThreads_acquire()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquire); }
555 >    public void testReleaseAcquireDifferentThreads_acquire_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquire); }
556 >    public void testReleaseAcquireDifferentThreads_acquireN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireN); }
557 >    public void testReleaseAcquireDifferentThreads_acquireN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireN); }
558 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
559 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
560 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
561 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
562 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimed); }
563 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimed); }
564 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimedN); }
565 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimedN); }
566 >    public void testReleaseAcquireDifferentThreads(boolean fair,
567 >                                                   final AcquireMethod acquirer) {
568 >        final Semaphore s = new Semaphore(0, fair);
569 >        final int rounds = 4;
570 >        long startTime = System.nanoTime();
571 >        Thread t = newStartedThread(new CheckedRunnable() {
572 >            public void realRun() throws InterruptedException {
573 >                for (int i = 0; i < rounds; i++) {
574 >                    assertFalse(s.hasQueuedThreads());
575 >                    if (i % 2 == 0)
576 >                        acquirer.acquire(s);
577 >                    else
578 >                        acquirer.acquire(s, 3);
579 >                }}});
580 >
581 >        for (int i = 0; i < rounds; i++) {
582 >            while (! (s.availablePermits() == 0 && s.hasQueuedThreads()))
583 >                Thread.yield();
584 >            assertTrue(t.isAlive());
585 >            if (i % 2 == 0)
586 >                s.release();
587 >            else
588 >                s.release(3);
589          }
590 +        awaitTermination(t);
591 +        assertEquals(0, s.availablePermits());
592 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
593      }
594  
595      /**
596 <     * getQueueLength reports number of waiting threads
848 <     */
849 <    public void testGetQueueLength_fair() {
850 <        final Semaphore lock = new Semaphore(1, true);
851 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
852 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
853 <        try {
854 <            assertEquals(0, lock.getQueueLength());
855 <            lock.acquireUninterruptibly();
856 <            t1.start();
857 <            Thread.sleep(SHORT_DELAY_MS);
858 <            assertEquals(1, lock.getQueueLength());
859 <            t2.start();
860 <            Thread.sleep(SHORT_DELAY_MS);
861 <            assertEquals(2, lock.getQueueLength());
862 <            t1.interrupt();
863 <            Thread.sleep(SHORT_DELAY_MS);
864 <            assertEquals(1, lock.getQueueLength());
865 <            lock.release();
866 <            Thread.sleep(SHORT_DELAY_MS);
867 <            assertEquals(0, lock.getQueueLength());
868 <            t1.join();
869 <            t2.join();
870 <        } catch(Exception e){
871 <            unexpectedException();
872 <        }
873 <    }
874 <
875 <
876 <    /**
877 <     * a deserialized serialized semaphore has same number of permits
596 >     * fair locks are strictly FIFO
597       */
598 <    public void testSerialization_fair() {
599 <        Semaphore l = new Semaphore(3, true);
600 <
601 <        try {
602 <            l.acquire();
603 <            l.release();
604 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
605 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
606 <            out.writeObject(l);
607 <            out.close();
608 <
609 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
610 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
611 <            Semaphore r = (Semaphore) in.readObject();
612 <            assertEquals(3, r.availablePermits());
613 <            assertTrue(r.isFair());
614 <            r.acquire();
615 <            r.release();
616 <        } catch(Exception e){
617 <            unexpectedException();
618 <        }
598 >    public void testFairLocksFifo() {
599 >        final PublicSemaphore s = new PublicSemaphore(1, true);
600 >        final CountDownLatch pleaseRelease = new CountDownLatch(1);
601 >        Thread t1 = newStartedThread(new CheckedRunnable() {
602 >            public void realRun() throws InterruptedException {
603 >                // Will block; permits are available, but not three
604 >                s.acquire(3);
605 >            }});
606 >
607 >        waitForQueuedThread(s, t1);
608 >
609 >        Thread t2 = newStartedThread(new CheckedRunnable() {
610 >            public void realRun() throws InterruptedException {
611 >                // Will fail, even though 1 permit is available
612 >                assertFalse(s.tryAcquire(0L, MILLISECONDS));
613 >                assertFalse(s.tryAcquire(1, 0L, MILLISECONDS));
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       * toString indicates current number of permits
637       */
638 <    public void testToString() {
639 <        Semaphore s = new Semaphore(0);
640 <        String us = s.toString();
641 <        assertTrue(us.indexOf("Permits = 0") >= 0);
642 <        s.release();
910 <        String s1 = s.toString();
911 <        assertTrue(s1.indexOf("Permits = 1") >= 0);
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 <        String s2 = s.toString();
645 <        assertTrue(s2.indexOf("Permits = 2") >= 0);
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  
651   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines