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.43 by jsr166, Tue Jan 23 20:44:11 2018 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 > 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  
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 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 <        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() {
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          }
126    }
273  
274 <    /**
129 <     * Uninterruptible acquire and release of semaphore succeed if
130 <     * initially available
131 <     */
132 <    public void testAcquireUninterruptiblyReleaseInSameThread() {
133 <        Semaphore s = new Semaphore(1, false);
134 <        try {
135 <            s.acquireUninterruptibly();
136 <            s.release();
137 <            s.acquireUninterruptibly();
138 <            s.release();
139 <            s.acquireUninterruptibly();
140 <            s.release();
141 <            s.acquireUninterruptibly();
142 <            s.release();
143 <            s.acquireUninterruptibly();
144 <            s.release();
145 <            assertEquals(1, s.availablePermits());
146 <        } finally {
147 <        }
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 <        }
298 <    }
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 <    /**
312 <     * 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 <    }
203 <
204 <    /**
205 <     * 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 <    }
311 >        assertThreadBlocks(t1, Thread.State.WAITING);
312 >        assertThreadBlocks(t2, Thread.State.WAITING);
313  
314 +        s.release(2);
315  
316 <    /**
317 <     *  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 <        }
316 >        awaitTermination(t1);
317 >        awaitTermination(t2);
318      }
319  
320      /**
321       * hasQueuedThreads reports whether there are waiting threads
322       */
323 <    public void testHasQueuedThreads() {
324 <        final Semaphore lock = new Semaphore(1, false);
325 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
326 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
327 <        try {
328 <            assertFalse(lock.hasQueuedThreads());
329 <            lock.acquireUninterruptibly();
330 <            t1.start();
331 <            Thread.sleep(SHORT_DELAY_MS);
332 <            assertTrue(lock.hasQueuedThreads());
333 <            t2.start();
334 <            Thread.sleep(SHORT_DELAY_MS);
335 <            assertTrue(lock.hasQueuedThreads());
336 <            t1.interrupt();
337 <            Thread.sleep(SHORT_DELAY_MS);
338 <            assertTrue(lock.hasQueuedThreads());
339 <            lock.release();
340 <            Thread.sleep(SHORT_DELAY_MS);
341 <            assertFalse(lock.hasQueuedThreads());
332 <            t1.join();
333 <            t2.join();
334 <        } catch(Exception e){
335 <            unexpectedException();
336 <        }
337 <    }
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       * getQueueLength reports number of waiting threads
345       */
346 <    public void testGetQueueLength() {
347 <        final Semaphore lock = new Semaphore(1, false);
348 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
349 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
350 <        try {
351 <            assertEquals(0, lock.getQueueLength());
352 <            lock.acquireUninterruptibly();
353 <            t1.start();
354 <            Thread.sleep(SHORT_DELAY_MS);
355 <            assertEquals(1, lock.getQueueLength());
356 <            t2.start();
357 <            Thread.sleep(SHORT_DELAY_MS);
358 <            assertEquals(2, lock.getQueueLength());
359 <            t1.interrupt();
360 <            Thread.sleep(SHORT_DELAY_MS);
361 <            assertEquals(1, lock.getQueueLength());
362 <            lock.release();
363 <            Thread.sleep(SHORT_DELAY_MS);
364 <            assertEquals(0, lock.getQueueLength());
361 <            t1.join();
362 <            t2.join();
363 <        } catch(Exception e){
364 <            unexpectedException();
365 <        }
366 <    }
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  
366      /**
367       * getQueuedThreads includes waiting threads
368       */
369 <    public void testGetQueuedThreads() {
370 <        final PublicSemaphore lock = new PublicSemaphore(1, false);
371 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
372 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
373 <        try {
374 <            assertTrue(lock.getQueuedThreads().isEmpty());
375 <            lock.acquireUninterruptibly();
376 <            assertTrue(lock.getQueuedThreads().isEmpty());
377 <            t1.start();
378 <            Thread.sleep(SHORT_DELAY_MS);
379 <            assertTrue(lock.getQueuedThreads().contains(t1));
380 <            t2.start();
381 <            Thread.sleep(SHORT_DELAY_MS);
382 <            assertTrue(lock.getQueuedThreads().contains(t1));
383 <            assertTrue(lock.getQueuedThreads().contains(t2));
384 <            t1.interrupt();
385 <            Thread.sleep(SHORT_DELAY_MS);
386 <            assertFalse(lock.getQueuedThreads().contains(t1));
387 <            assertTrue(lock.getQueuedThreads().contains(t2));
388 <            lock.release();
389 <            Thread.sleep(SHORT_DELAY_MS);
390 <            assertTrue(lock.getQueuedThreads().isEmpty());
393 <            t1.join();
394 <            t2.join();
395 <        } catch(Exception e){
396 <            unexpectedException();
397 <        }
398 <    }
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       * drainPermits reports and removes given number of permits
394       */
395 <    public void testDrainPermits() {
396 <        Semaphore s = new Semaphore(0, false);
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);
# Line 412 | Line 406 | public class SemaphoreTest extends JSR16
406      }
407  
408      /**
409 <     * reducePermits reduces number of permits
409 >     * release(-N) throws IllegalArgumentException
410       */
411 <    public void testReducePermits() {
412 <        PublicSemaphore s = new PublicSemaphore(10, false);
413 <        assertEquals(10, s.availablePermits());
414 <        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);
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 <            l.acquire();
417 <            l.release();
418 <            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());
416 >            s.release(-1);
417 >            shouldThrow();
418 >        } catch (IllegalArgumentException success) {}
419      }
420  
421      /**
422 <     * tryAcquire succeeds when sufficient permits, else fails
422 >     * reducePermits(-N) throws IllegalArgumentException
423       */
424 <    public void testTryAcquireInSameThread_fair() {
425 <        Semaphore s = new Semaphore(2, true);
426 <        assertEquals(2, s.availablePermits());
427 <        assertTrue(s.tryAcquire());
428 <        assertTrue(s.tryAcquire());
429 <        assertEquals(0, s.availablePermits());
430 <        assertFalse(s.tryAcquire());
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 >            s.reducePermits(-1);
430 >            shouldThrow();
431 >        } catch (IllegalArgumentException success) {}
432      }
433  
434      /**
435 <     * tryAcquire(n) succeeds when sufficient permits, else fails
435 >     * reducePermits reduces number of permits
436       */
437 <    public void testTryAcquireNInSameThread_fair() {
438 <        Semaphore s = new Semaphore(2, true);
439 <        assertEquals(2, s.availablePermits());
440 <        assertTrue(s.tryAcquire(2));
441 <        assertEquals(0, s.availablePermits());
442 <        assertFalse(s.tryAcquire());
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 <     * 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();
495            s.release();
464              s.acquire();
465              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    }
466  
467 <    /**
468 <     * Acquire(n) and release(n) of semaphore succeed if initially available
469 <     */
470 <    public void testAcquireUninterruptiblyReleaseNInSameThread_fair() {
471 <        Semaphore s = new Semaphore(1, true);
472 <        try {
473 <            s.release(1);
474 <            s.acquireUninterruptibly(1);
475 <            s.release(2);
476 <            s.acquireUninterruptibly(2);
477 <            s.release(3);
478 <            s.acquireUninterruptibly(3);
479 <            s.release(4);
480 <            s.acquireUninterruptibly(4);
481 <            s.release(5);
482 <            s.acquireUninterruptibly(5);
483 <            assertEquals(1, s.availablePermits());
484 <        } finally {
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 <     * release(n) in one thread enables timed acquire(n) in another thread
501 >     * tryAcquire(n) succeeds when sufficient permits, else fails
502       */
503 <    public void testTimedAcquireReleaseNInSameThread_fair() {
504 <        Semaphore s = new Semaphore(1, true);
505 <        try {
506 <            s.release(1);
507 <            assertTrue(s.tryAcquire(1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
508 <            s.release(2);
509 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
510 <            s.release(3);
511 <            assertTrue(s.tryAcquire(3, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
512 <            s.release(4);
513 <            assertTrue(s.tryAcquire(4, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
514 <            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 <        }
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 in one thread enables timed acquire in another thread
518 >     * acquire succeeds if permits available
519       */
520 <    public void testTimedAcquireReleaseInSameThread_fair() {
521 <        Semaphore s = new Semaphore(1, true);
522 <        try {
523 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
524 <            s.release();
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();
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());
592        } catch( InterruptedException e){
593            unexpectedException();
546          }
547      }
548  
549      /**
550 <     * A release in one thread enables an acquire in another thread
550 >     * release in one thread enables acquire in another thread
551       */
552 <    public void testAcquireReleaseInDifferentThreads_fair() {
553 <        final Semaphore s = new Semaphore(0, true);
554 <        Thread t = new Thread(new Runnable() {
555 <                public void run() {
556 <                    try {
557 <                        s.acquire();
558 <                        s.acquire();
559 <                        s.acquire();
560 <                        s.acquire();
561 <                    } catch(InterruptedException ie){
562 <                        threadUnexpectedException();
563 <                    }
564 <                }
565 <            });
566 <        try {
567 <            t.start();
568 <            Thread.sleep(SHORT_DELAY_MS);
569 <            s.release();
570 <            s.release();
571 <            s.release();
572 <            s.release();
573 <            s.release();
574 <            s.release();
575 <            t.join();
576 <            assertEquals(2, s.availablePermits());
577 <        } catch( InterruptedException e){
578 <            unexpectedException();
579 <        }
580 <    }
581 <
582 <    /**
583 <     * release(n) in one thread enables acquire(n) in another thread
584 <     */
585 <    public void testAcquireReleaseNInDifferentThreads_fair() {
586 <        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();
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 <     * 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
594 >     * fair locks are strictly FIFO
595       */
596 <    public void testSerialization_fair() {
597 <        Semaphore l = new Semaphore(3, true);
598 <
599 <        try {
600 <            l.acquire();
601 <            l.release();
602 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
603 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
604 <            out.writeObject(l);
605 <            out.close();
606 <
607 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
608 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
609 <            Semaphore r = (Semaphore) in.readObject();
610 <            assertEquals(3, r.availablePermits());
611 <            assertTrue(r.isFair());
612 <            r.acquire();
613 <            r.release();
614 <        } catch(Exception e){
615 <            unexpectedException();
616 <        }
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       * 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