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.12 by dl, Sun Jan 4 22:58:03 2004 UTC vs.
Revision 1.35 by jsr166, Thu Nov 19 01:36:09 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
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 >        },
131 >        tryAcquireTimedN {
132 >            void acquire(Semaphore s, int permits) throws InterruptedException {
133 >                assertTrue(s.tryAcquire(permits, 2 * LONG_DELAY_MS, MILLISECONDS));
134 >            }
135 >        };
136 >
137 >        // Intentionally meta-circular
138 >
139 >        /** Acquires 1 permit. */
140 >        void acquire(Semaphore s) throws InterruptedException {
141 >            acquire(s, 1);
142 >        }
143 >        /** Acquires the given number of permits. */
144 >        void acquire(Semaphore s, int permits) throws InterruptedException {
145 >            for (int i = 0; i < permits; i++)
146 >                acquire(s);
147          }
148      }
149  
150      /**
151       * Zero, negative, and positive initial values are allowed in constructor
152       */
153 <    public void testConstructor() {
154 <        Semaphore s0 = new Semaphore(0, false);
155 <        assertEquals(0, s0.availablePermits());
156 <        assertFalse(s0.isFair());
157 <        Semaphore s1 = new Semaphore(-1, false);
158 <        assertEquals(-1, s1.availablePermits());
159 <        Semaphore s2 = new Semaphore(-1, false);
74 <        assertEquals(-1, s2.availablePermits());
75 <    }
76 <
77 <    /**
78 <     * tryAcquire succeeds when sufficient permits, else fails
79 <     */
80 <    public void testTryAcquireInSameThread() {
81 <        Semaphore s = new Semaphore(2, false);
82 <        assertEquals(2, s.availablePermits());
83 <        assertTrue(s.tryAcquire());
84 <        assertTrue(s.tryAcquire());
85 <        assertEquals(0, s.availablePermits());
86 <        assertFalse(s.tryAcquire());
87 <    }
88 <
89 <    /**
90 <     * Acquire and release of semaphore succeed if initially available
91 <     */
92 <    public void testAcquireReleaseInSameThread() {
93 <        Semaphore s = new Semaphore(1, false);
94 <        try {
95 <            s.acquire();
96 <            s.release();
97 <            s.acquire();
98 <            s.release();
99 <            s.acquire();
100 <            s.release();
101 <            s.acquire();
102 <            s.release();
103 <            s.acquire();
104 <            s.release();
105 <            assertEquals(1, s.availablePermits());
106 <        } catch( InterruptedException e){
107 <            unexpectedException();
108 <        }
109 <    }
110 <
111 <    /**
112 <     * Uninterruptible acquire and release of semaphore succeed if
113 <     * initially available
114 <     */
115 <    public void testAcquireUninterruptiblyReleaseInSameThread() {
116 <        Semaphore s = new Semaphore(1, false);
117 <        try {
118 <            s.acquireUninterruptibly();
119 <            s.release();
120 <            s.acquireUninterruptibly();
121 <            s.release();
122 <            s.acquireUninterruptibly();
123 <            s.release();
124 <            s.acquireUninterruptibly();
125 <            s.release();
126 <            s.acquireUninterruptibly();
127 <            s.release();
128 <            assertEquals(1, s.availablePermits());
129 <        } finally {
153 >    public void testConstructor()      { testConstructor(false); }
154 >    public void testConstructor_fair() { testConstructor(true); }
155 >    public void testConstructor(boolean fair) {
156 >        for (int permits : new int[] { -42, -1, 0, 1, 42 }) {
157 >            Semaphore s = new Semaphore(permits, fair);
158 >            assertEquals(permits, s.availablePermits());
159 >            assertEquals(fair, s.isFair());
160          }
161      }
162  
163      /**
164 <     * Timed Acquire and release of semaphore succeed if
135 <     * initially available
164 >     * Constructor without fairness argument behaves as nonfair
165       */
166 <    public void testTimedAcquireReleaseInSameThread() {
167 <        Semaphore s = new Semaphore(1, false);
168 <        try {
169 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
170 <            s.release();
142 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
143 <            s.release();
144 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
145 <            s.release();
146 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
147 <            s.release();
148 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
149 <            s.release();
150 <            assertEquals(1, s.availablePermits());
151 <        } catch( InterruptedException e){
152 <            unexpectedException();
166 >    public void testConstructorDefaultsToNonFair() {
167 >        for (int permits : new int[] { -42, -1, 0, 1, 42 }) {
168 >            Semaphore s = new Semaphore(permits);
169 >            assertEquals(permits, s.availablePermits());
170 >            assertFalse(s.isFair());
171          }
172      }
173  
174      /**
175 <     * A release in one thread enables an acquire in another thread
175 >     * tryAcquire succeeds when sufficient permits, else fails
176       */
177 <    public void testAcquireReleaseInDifferentThreads() {
178 <        final Semaphore s = new Semaphore(0, false);
179 <        Thread t = new Thread(new Runnable() {
180 <                public void run() {
181 <                    try {
182 <                        s.acquire();
183 <                        s.release();
184 <                        s.release();
185 <                        s.acquire();
186 <                    } catch(InterruptedException ie){
187 <                        threadUnexpectedException();
170 <                    }
171 <                }
172 <            });
173 <        try {
174 <            t.start();
175 <            Thread.sleep(SHORT_DELAY_MS);
176 <            s.release();
177 <            s.release();
178 <            s.acquire();
179 <            s.acquire();
180 <            s.release();
181 <            t.join();
182 <        } catch( InterruptedException e){
183 <            unexpectedException();
184 <        }
177 >    public void testTryAcquireInSameThread()      { testTryAcquireInSameThread(false); }
178 >    public void testTryAcquireInSameThread_fair() { testTryAcquireInSameThread(true); }
179 >    public void testTryAcquireInSameThread(boolean fair) {
180 >        Semaphore s = new Semaphore(2, fair);
181 >        assertEquals(2, s.availablePermits());
182 >        assertTrue(s.tryAcquire());
183 >        assertTrue(s.tryAcquire());
184 >        assertEquals(0, s.availablePermits());
185 >        assertFalse(s.tryAcquire());
186 >        assertFalse(s.tryAcquire());
187 >        assertEquals(0, s.availablePermits());
188      }
189  
190      /**
191 <     * A release in one thread enables an uninterruptible acquire in another thread
191 >     * timed tryAcquire times out
192       */
193 <    public void testUninterruptibleAcquireReleaseInDifferentThreads() {
194 <        final Semaphore s = new Semaphore(0, false);
195 <        Thread t = new Thread(new Runnable() {
196 <                public void run() {
197 <                    s.acquireUninterruptibly();
198 <                    s.release();
199 <                    s.release();
200 <                    s.acquireUninterruptibly();
201 <                }
202 <            });
203 <        try {
204 <            t.start();
205 <            Thread.sleep(SHORT_DELAY_MS);
206 <            s.release();
207 <            s.release();
208 <            s.acquireUninterruptibly();
209 <            s.acquireUninterruptibly();
210 <            s.release();
211 <            t.join();
212 <        } catch( InterruptedException e){
213 <            unexpectedException();
214 <        }
215 <    }
193 >    public void testTryAcquire_timeout()      { testTryAcquire_timeout(false); }
194 >    public void testTryAcquire_timeout_fair() { testTryAcquire_timeout(true); }
195 >    public void testTryAcquire_timeout(boolean fair) {
196 >        Semaphore s = new Semaphore(0, fair);
197 >        long startTime = System.nanoTime();
198 >        try { assertFalse(s.tryAcquire(timeoutMillis(), MILLISECONDS)); }
199 >        catch (InterruptedException e) { threadUnexpectedException(e); }
200 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
201 >    }
202 >
203 >    /**
204 >     * timed tryAcquire(N) times out
205 >     */
206 >    public void testTryAcquireN_timeout()      { testTryAcquireN_timeout(false); }
207 >    public void testTryAcquireN_timeout_fair() { testTryAcquireN_timeout(true); }
208 >    public void testTryAcquireN_timeout(boolean fair) {
209 >        Semaphore s = new Semaphore(2, fair);
210 >        long startTime = System.nanoTime();
211 >        try { assertFalse(s.tryAcquire(3, timeoutMillis(), MILLISECONDS)); }
212 >        catch (InterruptedException e) { threadUnexpectedException(e); }
213 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
214 >    }
215 >
216 >    /**
217 >     * acquire(), acquire(N), timed tryAcquired, timed tryAcquire(N)
218 >     * are interruptible
219 >     */
220 >    public void testInterruptible_acquire()               { testInterruptible(false, AcquireMethod.acquire); }
221 >    public void testInterruptible_acquire_fair()          { testInterruptible(true,  AcquireMethod.acquire); }
222 >    public void testInterruptible_acquireN()              { testInterruptible(false, AcquireMethod.acquireN); }
223 >    public void testInterruptible_acquireN_fair()         { testInterruptible(true,  AcquireMethod.acquireN); }
224 >    public void testInterruptible_tryAcquireTimed()       { testInterruptible(false, AcquireMethod.tryAcquireTimed); }
225 >    public void testInterruptible_tryAcquireTimed_fair()  { testInterruptible(true,  AcquireMethod.tryAcquireTimed); }
226 >    public void testInterruptible_tryAcquireTimedN()      { testInterruptible(false, AcquireMethod.tryAcquireTimedN); }
227 >    public void testInterruptible_tryAcquireTimedN_fair() { testInterruptible(true,  AcquireMethod.tryAcquireTimedN); }
228 >    public void testInterruptible(boolean fair, final AcquireMethod acquirer) {
229 >        final PublicSemaphore s = new PublicSemaphore(0, fair);
230 >        final Semaphore pleaseInterrupt = new Semaphore(0, fair);
231 >        Thread t = newStartedThread(new CheckedRunnable() {
232 >            public void realRun() {
233 >                // Interrupt before acquire
234 >                Thread.currentThread().interrupt();
235 >                try {
236 >                    acquirer.acquire(s);
237 >                    shouldThrow();
238 >                } catch (InterruptedException success) {}
239 >
240 >                // Interrupt during acquire
241 >                try {
242 >                    acquirer.acquire(s);
243 >                    shouldThrow();
244 >                } catch (InterruptedException success) {}
245 >
246 >                // Interrupt before acquire(N)
247 >                Thread.currentThread().interrupt();
248 >                try {
249 >                    acquirer.acquire(s, 3);
250 >                    shouldThrow();
251 >                } catch (InterruptedException success) {}
252 >
253 >                pleaseInterrupt.release();
254 >
255 >                // Interrupt during acquire(N)
256 >                try {
257 >                    acquirer.acquire(s, 3);
258 >                    shouldThrow();
259 >                } catch (InterruptedException success) {}
260 >            }});
261 >
262 >        waitForQueuedThread(s, t);
263 >        t.interrupt();
264 >        await(pleaseInterrupt);
265 >        waitForQueuedThread(s, t);
266 >        t.interrupt();
267 >        awaitTermination(t);
268 >    }
269 >
270 >    /**
271 >     * acquireUninterruptibly(), acquireUninterruptibly(N) are
272 >     * uninterruptible
273 >     */
274 >    public void testUninterruptible_acquireUninterruptibly()       { testUninterruptible(false, AcquireMethod.acquireUninterruptibly); }
275 >    public void testUninterruptible_acquireUninterruptibly_fair()  { testUninterruptible(true,  AcquireMethod.acquireUninterruptibly); }
276 >    public void testUninterruptible_acquireUninterruptiblyN()      { testUninterruptible(false, AcquireMethod.acquireUninterruptiblyN); }
277 >    public void testUninterruptible_acquireUninterruptiblyN_fair() { testUninterruptible(true,  AcquireMethod.acquireUninterruptiblyN); }
278 >    public void testUninterruptible(boolean fair, final AcquireMethod acquirer) {
279 >        final PublicSemaphore s = new PublicSemaphore(0, fair);
280 >        final Semaphore pleaseInterrupt = new Semaphore(-1, fair);
281 >
282 >        Thread t1 = newStartedThread(new CheckedRunnable() {
283 >            public void realRun() throws InterruptedException {
284 >                // Interrupt before acquire
285 >                pleaseInterrupt.release();
286 >                Thread.currentThread().interrupt();
287 >                acquirer.acquire(s);
288 >                assertTrue(Thread.interrupted());
289 >            }});
290 >
291 >        Thread t2 = newStartedThread(new CheckedRunnable() {
292 >            public void realRun() throws InterruptedException {
293 >                // Interrupt during acquire
294 >                pleaseInterrupt.release();
295 >                acquirer.acquire(s);
296 >                assertTrue(Thread.interrupted());
297 >            }});
298 >
299 >        await(pleaseInterrupt);
300 >        waitForQueuedThread(s, t1);
301 >        waitForQueuedThread(s, t2);
302 >        t2.interrupt();
303  
304 +        assertThreadStaysAlive(t1);
305 +        assertTrue(t2.isAlive());
306  
307 <    /**
216 <     *  A release in one thread enables a timed acquire in another thread
217 <     */
218 <    public void testTimedAcquireReleaseInDifferentThreads() {
219 <        final Semaphore s = new Semaphore(1, false);
220 <        Thread t = new Thread(new Runnable() {
221 <                public void run() {
222 <                    try {
223 <                        s.release();
224 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
225 <                        s.release();
226 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
307 >        s.release(2);
308  
309 <                    } catch(InterruptedException ie){
310 <                        threadUnexpectedException();
230 <                    }
231 <                }
232 <            });
233 <        try {
234 <            t.start();
235 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
236 <            s.release();
237 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
238 <            s.release();
239 <            s.release();
240 <            t.join();
241 <        } catch( InterruptedException e){
242 <            unexpectedException();
243 <        }
244 <    }
245 <
246 <    /**
247 <     * A waiting acquire blocks interruptibly
248 <     */
249 <    public void testAcquire_InterruptedException() {
250 <        final Semaphore s = new Semaphore(0, false);
251 <        Thread t = new Thread(new Runnable() {
252 <                public void run() {
253 <                    try {
254 <                        s.acquire();
255 <                        threadShouldThrow();
256 <                    } catch(InterruptedException success){}
257 <                }
258 <            });
259 <        t.start();
260 <        try {
261 <            Thread.sleep(SHORT_DELAY_MS);
262 <            t.interrupt();
263 <            t.join();
264 <        } catch(InterruptedException e){
265 <            unexpectedException();
266 <        }
267 <    }
268 <    
269 <    /**
270 <     *  A waiting timed acquire blocks interruptibly
271 <     */
272 <    public void testTryAcquire_InterruptedException() {
273 <        final Semaphore s = new Semaphore(0, false);
274 <        Thread t = new Thread(new Runnable() {
275 <                public void run() {
276 <                    try {
277 <                        s.tryAcquire(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
278 <                        threadShouldThrow();
279 <                    } catch(InterruptedException success){
280 <                    }
281 <                }
282 <            });
283 <        t.start();
284 <        try {
285 <            Thread.sleep(SHORT_DELAY_MS);
286 <            t.interrupt();
287 <            t.join();
288 <        } catch(InterruptedException e){
289 <            unexpectedException();
290 <        }
309 >        awaitTermination(t1);
310 >        awaitTermination(t2);
311      }
312  
313      /**
314       * hasQueuedThreads reports whether there are waiting threads
315       */
316 <    public void testHasQueuedThreads() {
317 <        final Semaphore lock = new Semaphore(1, false);
318 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
319 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
320 <        try {
321 <            assertFalse(lock.hasQueuedThreads());
322 <            lock.acquireUninterruptibly();
323 <            t1.start();
324 <            Thread.sleep(SHORT_DELAY_MS);
325 <            assertTrue(lock.hasQueuedThreads());
326 <            t2.start();
327 <            Thread.sleep(SHORT_DELAY_MS);
328 <            assertTrue(lock.hasQueuedThreads());
329 <            t1.interrupt();
330 <            Thread.sleep(SHORT_DELAY_MS);
331 <            assertTrue(lock.hasQueuedThreads());
332 <            lock.release();
333 <            Thread.sleep(SHORT_DELAY_MS);
334 <            assertFalse(lock.hasQueuedThreads());
315 <            t1.join();
316 <            t2.join();
317 <        } catch(Exception e){
318 <            unexpectedException();
319 <        }
320 <    }
316 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
317 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
318 >    public void testHasQueuedThreads(boolean fair) {
319 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
320 >        assertFalse(lock.hasQueuedThreads());
321 >        lock.acquireUninterruptibly();
322 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
323 >        waitForQueuedThread(lock, t1);
324 >        assertTrue(lock.hasQueuedThreads());
325 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
326 >        waitForQueuedThread(lock, t2);
327 >        assertTrue(lock.hasQueuedThreads());
328 >        t1.interrupt();
329 >        awaitTermination(t1);
330 >        assertTrue(lock.hasQueuedThreads());
331 >        lock.release();
332 >        awaitTermination(t2);
333 >        assertFalse(lock.hasQueuedThreads());
334 >    }
335  
336      /**
337       * getQueueLength reports number of waiting threads
338       */
339 <    public void testGetQueueLength() {
340 <        final Semaphore lock = new Semaphore(1, false);
341 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
342 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
343 <        try {
344 <            assertEquals(0, lock.getQueueLength());
345 <            lock.acquireUninterruptibly();
346 <            t1.start();
347 <            Thread.sleep(SHORT_DELAY_MS);
348 <            assertEquals(1, lock.getQueueLength());
349 <            t2.start();
350 <            Thread.sleep(SHORT_DELAY_MS);
351 <            assertEquals(2, lock.getQueueLength());
352 <            t1.interrupt();
353 <            Thread.sleep(SHORT_DELAY_MS);
354 <            assertEquals(1, lock.getQueueLength());
355 <            lock.release();
356 <            Thread.sleep(SHORT_DELAY_MS);
357 <            assertEquals(0, lock.getQueueLength());
344 <            t1.join();
345 <            t2.join();
346 <        } catch(Exception e){
347 <            unexpectedException();
348 <        }
349 <    }
339 >    public void testGetQueueLength()      { testGetQueueLength(false); }
340 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
341 >    public void testGetQueueLength(boolean fair) {
342 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
343 >        assertEquals(0, lock.getQueueLength());
344 >        lock.acquireUninterruptibly();
345 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
346 >        waitForQueuedThread(lock, t1);
347 >        assertEquals(1, lock.getQueueLength());
348 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
349 >        waitForQueuedThread(lock, t2);
350 >        assertEquals(2, lock.getQueueLength());
351 >        t1.interrupt();
352 >        awaitTermination(t1);
353 >        assertEquals(1, lock.getQueueLength());
354 >        lock.release();
355 >        awaitTermination(t2);
356 >        assertEquals(0, lock.getQueueLength());
357 >    }
358  
359      /**
360       * getQueuedThreads includes waiting threads
361       */
362 <    public void testGetQueuedThreads() {
363 <        final PublicSemaphore lock = new PublicSemaphore(1, false);
364 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
365 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
366 <        try {
367 <            assertTrue(lock.getQueuedThreads().isEmpty());
368 <            lock.acquireUninterruptibly();
369 <            assertTrue(lock.getQueuedThreads().isEmpty());
370 <            t1.start();
371 <            Thread.sleep(SHORT_DELAY_MS);
372 <            assertTrue(lock.getQueuedThreads().contains(t1));
373 <            t2.start();
374 <            Thread.sleep(SHORT_DELAY_MS);
375 <            assertTrue(lock.getQueuedThreads().contains(t1));
376 <            assertTrue(lock.getQueuedThreads().contains(t2));
377 <            t1.interrupt();
378 <            Thread.sleep(SHORT_DELAY_MS);
379 <            assertFalse(lock.getQueuedThreads().contains(t1));
380 <            assertTrue(lock.getQueuedThreads().contains(t2));
381 <            lock.release();
382 <            Thread.sleep(SHORT_DELAY_MS);
383 <            assertTrue(lock.getQueuedThreads().isEmpty());
376 <            t1.join();
377 <            t2.join();
378 <        } catch(Exception e){
379 <            unexpectedException();
380 <        }
381 <    }
362 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
363 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
364 >    public void testGetQueuedThreads(boolean fair) {
365 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
366 >        assertTrue(lock.getQueuedThreads().isEmpty());
367 >        lock.acquireUninterruptibly();
368 >        assertTrue(lock.getQueuedThreads().isEmpty());
369 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
370 >        waitForQueuedThread(lock, t1);
371 >        assertTrue(lock.getQueuedThreads().contains(t1));
372 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
373 >        waitForQueuedThread(lock, t2);
374 >        assertTrue(lock.getQueuedThreads().contains(t1));
375 >        assertTrue(lock.getQueuedThreads().contains(t2));
376 >        t1.interrupt();
377 >        awaitTermination(t1);
378 >        assertFalse(lock.getQueuedThreads().contains(t1));
379 >        assertTrue(lock.getQueuedThreads().contains(t2));
380 >        lock.release();
381 >        awaitTermination(t2);
382 >        assertTrue(lock.getQueuedThreads().isEmpty());
383 >    }
384  
385      /**
386       * drainPermits reports and removes given number of permits
387       */
388 <    public void testDrainPermits() {
389 <        Semaphore s = new Semaphore(0, false);
388 >    public void testDrainPermits()      { testDrainPermits(false); }
389 >    public void testDrainPermits_fair() { testDrainPermits(true); }
390 >    public void testDrainPermits(boolean fair) {
391 >        Semaphore s = new Semaphore(0, fair);
392          assertEquals(0, s.availablePermits());
393          assertEquals(0, s.drainPermits());
394          s.release(10);
# Line 395 | Line 399 | public class SemaphoreTest extends JSR16
399      }
400  
401      /**
402 <     * reducePermits reduces number of permits
402 >     * release(-N) throws IllegalArgumentException
403       */
404 <    public void testReducePermits() {
405 <        PublicSemaphore s = new PublicSemaphore(10, false);
406 <        assertEquals(10, s.availablePermits());
407 <        s.reducePermits(1);
404 <        assertEquals(9, s.availablePermits());
405 <        s.reducePermits(10);
406 <        assertEquals(-1, s.availablePermits());
407 <    }
408 <
409 <    /**
410 <     * a deserialized serialized semaphore has same number of permits
411 <     */
412 <    public void testSerialization() {
413 <        Semaphore l = new Semaphore(3, false);
404 >    public void testReleaseIAE()      { testReleaseIAE(false); }
405 >    public void testReleaseIAE_fair() { testReleaseIAE(true); }
406 >    public void testReleaseIAE(boolean fair) {
407 >        Semaphore s = new Semaphore(10, fair);
408          try {
409 <            l.acquire();
410 <            l.release();
411 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
418 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
419 <            out.writeObject(l);
420 <            out.close();
421 <
422 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
423 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
424 <            Semaphore r = (Semaphore) in.readObject();
425 <            assertEquals(3, r.availablePermits());
426 <            assertFalse(r.isFair());
427 <            r.acquire();
428 <            r.release();
429 <        } catch(Exception e){
430 <            unexpectedException();
431 <        }
432 <    }
433 <
434 <
435 <    /**
436 <     * Zero, negative, and positive initial values are allowed in constructor
437 <     */
438 <    public void testConstructor_fair() {
439 <        Semaphore s0 = new Semaphore(0, true);
440 <        assertEquals(0, s0.availablePermits());
441 <        assertTrue(s0.isFair());
442 <        Semaphore s1 = new Semaphore(-1, true);
443 <        assertEquals(-1, s1.availablePermits());
444 <        Semaphore s2 = new Semaphore(-1, true);
445 <        assertEquals(-1, s2.availablePermits());
409 >            s.release(-1);
410 >            shouldThrow();
411 >        } catch (IllegalArgumentException success) {}
412      }
413  
414      /**
415 <     * tryAcquire succeeds when sufficient permits, else fails
415 >     * reducePermits(-N) throws IllegalArgumentException
416       */
417 <    public void testTryAcquireInSameThread_fair() {
418 <        Semaphore s = new Semaphore(2, true);
419 <        assertEquals(2, s.availablePermits());
420 <        assertTrue(s.tryAcquire());
421 <        assertTrue(s.tryAcquire());
422 <        assertEquals(0, s.availablePermits());
423 <        assertFalse(s.tryAcquire());
417 >    public void testReducePermitsIAE()      { testReducePermitsIAE(false); }
418 >    public void testReducePermitsIAE_fair() { testReducePermitsIAE(true); }
419 >    public void testReducePermitsIAE(boolean fair) {
420 >        PublicSemaphore s = new PublicSemaphore(10, fair);
421 >        try {
422 >            s.reducePermits(-1);
423 >            shouldThrow();
424 >        } catch (IllegalArgumentException success) {}
425      }
426  
427      /**
428 <     * tryAcquire(n) succeeds when sufficient permits, else fails
428 >     * reducePermits reduces number of permits
429       */
430 <    public void testTryAcquireNInSameThread_fair() {
431 <        Semaphore s = new Semaphore(2, true);
432 <        assertEquals(2, s.availablePermits());
433 <        assertTrue(s.tryAcquire(2));
434 <        assertEquals(0, s.availablePermits());
435 <        assertFalse(s.tryAcquire());
430 >    public void testReducePermits()      { testReducePermits(false); }
431 >    public void testReducePermits_fair() { testReducePermits(true); }
432 >    public void testReducePermits(boolean fair) {
433 >        PublicSemaphore s = new PublicSemaphore(10, fair);
434 >        assertEquals(10, s.availablePermits());
435 >        s.reducePermits(0);
436 >        assertEquals(10, s.availablePermits());
437 >        s.reducePermits(1);
438 >        assertEquals(9, s.availablePermits());
439 >        s.reducePermits(10);
440 >        assertEquals(-1, s.availablePermits());
441 >        s.reducePermits(10);
442 >        assertEquals(-11, s.availablePermits());
443 >        s.reducePermits(0);
444 >        assertEquals(-11, s.availablePermits());
445      }
446  
447      /**
448 <     * Acquire and release of semaphore succeed if initially available
448 >     * a reserialized semaphore has same number of permits and
449 >     * fairness, but no queued threads
450       */
451 <    public void testAcquireReleaseInSameThread_fair() {
452 <        Semaphore s = new Semaphore(1, true);
451 >    public void testSerialization()      { testSerialization(false); }
452 >    public void testSerialization_fair() { testSerialization(true); }
453 >    public void testSerialization(boolean fair) {
454          try {
455 +            Semaphore s = new Semaphore(3, fair);
456              s.acquire();
478            s.release();
479            s.acquire();
480            s.release();
481            s.acquire();
482            s.release();
483            s.acquire();
484            s.release();
457              s.acquire();
458              s.release();
487            assertEquals(1, s.availablePermits());
488        } catch( InterruptedException e){
489            unexpectedException();
490        }
491    }
492
493    /**
494     * Acquire(n) and release(n) of semaphore succeed if initially available
495     */
496    public void testAcquireReleaseNInSameThread_fair() {
497        Semaphore s = new Semaphore(1, true);
498        try {
499            s.release(1);
500            s.acquire(1);
501            s.release(2);
502            s.acquire(2);
503            s.release(3);
504            s.acquire(3);
505            s.release(4);
506            s.acquire(4);
507            s.release(5);
508            s.acquire(5);
509            assertEquals(1, s.availablePermits());
510        } catch( InterruptedException e){
511            unexpectedException();
512        }
513    }
459  
460 <    /**
461 <     * Acquire(n) and release(n) of semaphore succeed if initially available
462 <     */
463 <    public void testAcquireUninterruptiblyReleaseNInSameThread_fair() {
464 <        Semaphore s = new Semaphore(1, true);
465 <        try {
466 <            s.release(1);
467 <            s.acquireUninterruptibly(1);
468 <            s.release(2);
469 <            s.acquireUninterruptibly(2);
470 <            s.release(3);
471 <            s.acquireUninterruptibly(3);
472 <            s.release(4);
473 <            s.acquireUninterruptibly(4);
474 <            s.release(5);
475 <            s.acquireUninterruptibly(5);
476 <            assertEquals(1, s.availablePermits());
477 <        } finally {
460 >            Semaphore clone = serialClone(s);
461 >            assertEquals(fair, s.isFair());
462 >            assertEquals(fair, clone.isFair());
463 >            assertEquals(2, s.availablePermits());
464 >            assertEquals(2, clone.availablePermits());
465 >            clone.acquire();
466 >            clone.acquire();
467 >            clone.release();
468 >            assertEquals(2, s.availablePermits());
469 >            assertEquals(1, clone.availablePermits());
470 >            assertFalse(s.hasQueuedThreads());
471 >            assertFalse(clone.hasQueuedThreads());
472 >        } catch (InterruptedException e) { threadUnexpectedException(e); }
473 >
474 >        {
475 >            PublicSemaphore s = new PublicSemaphore(0, fair);
476 >            Thread t = newStartedThread(new InterruptibleLockRunnable(s));
477 >            // waitForQueuedThreads(s); // suffers from "flicker", so ...
478 >            waitForQueuedThread(s, t);  // ... we use this instead
479 >            PublicSemaphore clone = serialClone(s);
480 >            assertEquals(fair, s.isFair());
481 >            assertEquals(fair, clone.isFair());
482 >            assertEquals(0, s.availablePermits());
483 >            assertEquals(0, clone.availablePermits());
484 >            assertTrue(s.hasQueuedThreads());
485 >            assertFalse(clone.hasQueuedThreads());
486 >            s.release();
487 >            awaitTermination(t);
488 >            assertFalse(s.hasQueuedThreads());
489 >            assertFalse(clone.hasQueuedThreads());
490          }
491      }
492  
493      /**
494 <     * release(n) in one thread enables timed acquire(n) in another thread
494 >     * tryAcquire(n) succeeds when sufficient permits, else fails
495       */
496 <    public void testTimedAcquireReleaseNInSameThread_fair() {
497 <        Semaphore s = new Semaphore(1, true);
498 <        try {
499 <            s.release(1);
500 <            assertTrue(s.tryAcquire(1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
501 <            s.release(2);
502 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
503 <            s.release(3);
504 <            assertTrue(s.tryAcquire(3, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
505 <            s.release(4);
506 <            assertTrue(s.tryAcquire(4, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
507 <            s.release(5);
551 <            assertTrue(s.tryAcquire(5, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
552 <            assertEquals(1, s.availablePermits());
553 <        } catch( InterruptedException e){
554 <            unexpectedException();
555 <        }
496 >    public void testTryAcquireNInSameThread()      { testTryAcquireNInSameThread(false); }
497 >    public void testTryAcquireNInSameThread_fair() { testTryAcquireNInSameThread(true); }
498 >    public void testTryAcquireNInSameThread(boolean fair) {
499 >        Semaphore s = new Semaphore(2, fair);
500 >        assertEquals(2, s.availablePermits());
501 >        assertFalse(s.tryAcquire(3));
502 >        assertEquals(2, s.availablePermits());
503 >        assertTrue(s.tryAcquire(2));
504 >        assertEquals(0, s.availablePermits());
505 >        assertFalse(s.tryAcquire(1));
506 >        assertFalse(s.tryAcquire(2));
507 >        assertEquals(0, s.availablePermits());
508      }
509  
510      /**
511 <     * release in one thread enables timed acquire in another thread
511 >     * acquire succeeds if permits available
512       */
513 <    public void testTimedAcquireReleaseInSameThread_fair() {
514 <        Semaphore s = new Semaphore(1, true);
515 <        try {
516 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
517 <            s.release();
518 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
519 <            s.release();
520 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
521 <            s.release();
522 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
523 <            s.release();
524 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
525 <            s.release();
513 >    public void testReleaseAcquireSameThread_acquire()       { testReleaseAcquireSameThread(false, AcquireMethod.acquire); }
514 >    public void testReleaseAcquireSameThread_acquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquire); }
515 >    public void testReleaseAcquireSameThread_acquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireN); }
516 >    public void testReleaseAcquireSameThread_acquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireN); }
517 >    public void testReleaseAcquireSameThread_acquireUninterruptibly()       { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
518 >    public void testReleaseAcquireSameThread_acquireUninterruptibly_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
519 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
520 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
521 >    public void testReleaseAcquireSameThread_tryAcquire()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquire); }
522 >    public void testReleaseAcquireSameThread_tryAcquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquire); }
523 >    public void testReleaseAcquireSameThread_tryAcquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireN); }
524 >    public void testReleaseAcquireSameThread_tryAcquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireN); }
525 >    public void testReleaseAcquireSameThread_tryAcquireTimed()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimed); }
526 >    public void testReleaseAcquireSameThread_tryAcquireTimed_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimed); }
527 >    public void testReleaseAcquireSameThread_tryAcquireTimedN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimedN); }
528 >    public void testReleaseAcquireSameThread_tryAcquireTimedN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimedN); }
529 >    public void testReleaseAcquireSameThread(boolean fair,
530 >                                             final AcquireMethod acquirer) {
531 >        Semaphore s = new Semaphore(1, fair);
532 >        for (int i = 1; i < 6; i++) {
533 >            s.release(i);
534 >            assertEquals(1 + i, s.availablePermits());
535 >            try {
536 >                acquirer.acquire(s, i);
537 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
538              assertEquals(1, s.availablePermits());
575        } catch( InterruptedException e){
576            unexpectedException();
539          }
540      }
541  
542      /**
543 <     * A release in one thread enables an acquire in another thread
543 >     * release in one thread enables acquire in another thread
544       */
545 <    public void testAcquireReleaseInDifferentThreads_fair() {
546 <        final Semaphore s = new Semaphore(0, true);
547 <        Thread t = new Thread(new Runnable() {
548 <                public void run() {
549 <                    try {
550 <                        s.acquire();
551 <                        s.acquire();
552 <                        s.acquire();
553 <                        s.acquire();
554 <                    } catch(InterruptedException ie){
555 <                        threadUnexpectedException();
556 <                    }
557 <                }
558 <            });
559 <        try {
560 <            t.start();
561 <            Thread.sleep(SHORT_DELAY_MS);
562 <            s.release();
563 <            s.release();
564 <            s.release();
565 <            s.release();
566 <            s.release();
567 <            s.release();
568 <            t.join();
569 <            assertEquals(2, s.availablePermits());
570 <        } catch( InterruptedException e){
571 <            unexpectedException();
572 <        }
573 <    }
574 <
575 <    /**
576 <     * release(n) in one thread enables acquire(n) in another thread
577 <     */
578 <    public void testAcquireReleaseNInDifferentThreads_fair() {
579 <        final Semaphore s = new Semaphore(0, true);
618 <        Thread t = new Thread(new Runnable() {
619 <                public void run() {
620 <                    try {
621 <                        s.acquire();
622 <                        s.release(2);
623 <                        s.acquire();
624 <                    } catch(InterruptedException ie){
625 <                        threadUnexpectedException();
626 <                    }
627 <                }
628 <            });
629 <        try {
630 <            t.start();
631 <            Thread.sleep(SHORT_DELAY_MS);
632 <            s.release(2);
633 <            s.acquire(2);
634 <            s.release(1);
635 <            t.join();
636 <        } catch( InterruptedException e){
637 <            unexpectedException();
638 <        }
639 <    }
640 <
641 <    /**
642 <     * release(n) in one thread enables acquire(n) in another thread
643 <     */
644 <    public void testAcquireReleaseNInDifferentThreads_fair2() {
645 <        final Semaphore s = new Semaphore(0, true);
646 <        Thread t = new Thread(new Runnable() {
647 <                public void run() {
648 <                    try {
649 <                        s.acquire(2);
650 <                        s.acquire(2);
651 <                        s.release(4);
652 <                    } catch(InterruptedException ie){
653 <                        threadUnexpectedException();
654 <                    }
655 <                }
656 <            });
657 <        try {
658 <            t.start();
659 <            Thread.sleep(SHORT_DELAY_MS);
660 <            s.release(6);
661 <            s.acquire(2);
662 <            s.acquire(2);
663 <            s.release(2);
664 <            t.join();
665 <        } catch( InterruptedException e){
666 <            unexpectedException();
545 >    public void testReleaseAcquireDifferentThreads_acquire()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquire); }
546 >    public void testReleaseAcquireDifferentThreads_acquire_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquire); }
547 >    public void testReleaseAcquireDifferentThreads_acquireN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireN); }
548 >    public void testReleaseAcquireDifferentThreads_acquireN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireN); }
549 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
550 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
551 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
552 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
553 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimed); }
554 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimed); }
555 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimedN); }
556 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimedN); }
557 >    public void testReleaseAcquireDifferentThreads(boolean fair,
558 >                                                   final AcquireMethod acquirer) {
559 >        final Semaphore s = new Semaphore(0, fair);
560 >        final int rounds = 4;
561 >        long startTime = System.nanoTime();
562 >        Thread t = newStartedThread(new CheckedRunnable() {
563 >            public void realRun() throws InterruptedException {
564 >                for (int i = 0; i < rounds; i++) {
565 >                    assertFalse(s.hasQueuedThreads());
566 >                    if (i % 2 == 0)
567 >                        acquirer.acquire(s);
568 >                    else
569 >                        acquirer.acquire(s, 3);
570 >                }}});
571 >
572 >        for (int i = 0; i < rounds; i++) {
573 >            while (! (s.availablePermits() == 0 && s.hasQueuedThreads()))
574 >                Thread.yield();
575 >            assertTrue(t.isAlive());
576 >            if (i % 2 == 0)
577 >                s.release();
578 >            else
579 >                s.release(3);
580          }
581 +        awaitTermination(t);
582 +        assertEquals(0, s.availablePermits());
583 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
584      }
585  
670
671
672
673
586      /**
587 <     * release in one thread enables timed acquire in another thread
587 >     * fair locks are strictly FIFO
588       */
589 <    public void testTimedAcquireReleaseInDifferentThreads_fair() {
590 <        final Semaphore s = new Semaphore(1, true);
591 <        Thread t = new Thread(new Runnable() {
592 <                public void run() {
593 <                    try {
594 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
595 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
596 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
597 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
598 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
599 <
600 <                    } catch(InterruptedException ie){
601 <                        threadUnexpectedException();
602 <                    }
603 <                }
604 <            });
605 <        t.start();
606 <        try {
607 <            s.release();
608 <            s.release();
609 <            s.release();
610 <            s.release();
611 <            s.release();
612 <            t.join();
613 <        } catch( InterruptedException e){
614 <            unexpectedException();
615 <        }
589 >    public void testFairLocksFifo() {
590 >        final PublicSemaphore s = new PublicSemaphore(1, true);
591 >        final CountDownLatch pleaseRelease = new CountDownLatch(1);
592 >        Thread t1 = newStartedThread(new CheckedRunnable() {
593 >            public void realRun() throws InterruptedException {
594 >                // Will block; permits are available, but not three
595 >                s.acquire(3);
596 >            }});
597 >
598 >        waitForQueuedThreads(s);
599 >
600 >        Thread t2 = newStartedThread(new CheckedRunnable() {
601 >            public void realRun() throws InterruptedException {
602 >                // Will fail, even though 1 permit is available
603 >                assertFalse(s.tryAcquire(0L, MILLISECONDS));
604 >                assertFalse(s.tryAcquire(1, 0L, MILLISECONDS));
605 >
606 >                // untimed tryAcquire will barge and succeed
607 >                assertTrue(s.tryAcquire());
608 >                s.release(2);
609 >                assertTrue(s.tryAcquire(2));
610 >                s.release();
611 >
612 >                pleaseRelease.countDown();
613 >                // Will queue up behind t1, even though 1 permit is available
614 >                s.acquire();
615 >            }});
616 >
617 >        await(pleaseRelease);
618 >        waitForQueuedThread(s, t2);
619 >        s.release(2);
620 >        awaitTermination(t1);
621 >        assertTrue(t2.isAlive());
622 >        s.release();
623 >        awaitTermination(t2);
624      }
625  
626      /**
627 <     * release(n) in one thread enables timed acquire(n) in another thread
628 <     */
629 <    public void testTimedAcquireReleaseNInDifferentThreads_fair() {
630 <        final Semaphore s = new Semaphore(2, true);
631 <        Thread t = new Thread(new Runnable() {
632 <                public void run() {
633 <                    try {
634 <                        threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
635 <                        s.release(2);
636 <                        threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
637 <                        s.release(2);
638 <                    } catch(InterruptedException ie){
639 <                        threadUnexpectedException();
720 <                    }
721 <                }
722 <            });
723 <        t.start();
724 <        try {
725 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
726 <            s.release(2);
727 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
728 <            s.release(2);
729 <            t.join();
730 <        } catch( InterruptedException e){
731 <            unexpectedException();
732 <        }
733 <    }
734 <
735 <    /**
736 <     * A waiting acquire blocks interruptibly
737 <     */
738 <    public void testAcquire_InterruptedException_fair() {
739 <        final Semaphore s = new Semaphore(0, true);
740 <        Thread t = new Thread(new Runnable() {
741 <                public void run() {
742 <                    try {
743 <                        s.acquire();
744 <                        threadShouldThrow();
745 <                    } catch(InterruptedException success){}
746 <                }
747 <            });
748 <        t.start();
749 <        try {
750 <            Thread.sleep(SHORT_DELAY_MS);
751 <            t.interrupt();
752 <            t.join();
753 <        } catch(InterruptedException e){
754 <            unexpectedException();
755 <        }
756 <    }
757 <
758 <    /**
759 <     * A waiting acquire(n) blocks interruptibly
760 <     */
761 <    public void testAcquireN_InterruptedException_fair() {
762 <        final Semaphore s = new Semaphore(2, true);
763 <        Thread t = new Thread(new Runnable() {
764 <                public void run() {
765 <                    try {
766 <                        s.acquire(3);
767 <                        threadShouldThrow();
768 <                    } catch(InterruptedException success){}
769 <                }
770 <            });
771 <        t.start();
772 <        try {
773 <            Thread.sleep(SHORT_DELAY_MS);
774 <            t.interrupt();
775 <            t.join();
776 <        } catch(InterruptedException e){
777 <            unexpectedException();
778 <        }
779 <    }
780 <    
781 <    /**
782 <     *  A waiting tryAcquire blocks interruptibly
783 <     */
784 <    public void testTryAcquire_InterruptedException_fair() {
785 <        final Semaphore s = new Semaphore(0, true);
786 <        Thread t = new Thread(new Runnable() {
787 <                public void run() {
788 <                    try {
789 <                        s.tryAcquire(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
790 <                        threadShouldThrow();
791 <                    } catch(InterruptedException success){
792 <                    }
793 <                }
794 <            });
795 <        t.start();
796 <        try {
797 <            Thread.sleep(SHORT_DELAY_MS);
798 <            t.interrupt();
799 <            t.join();
800 <        } catch(InterruptedException e){
801 <            unexpectedException();
802 <        }
803 <    }
804 <
805 <    /**
806 <     *  A waiting tryAcquire(n) blocks interruptibly
807 <     */
808 <    public void testTryAcquireN_InterruptedException_fair() {
809 <        final Semaphore s = new Semaphore(1, true);
810 <        Thread t = new Thread(new Runnable() {
811 <                public void run() {
812 <                    try {
813 <                        s.tryAcquire(4, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
814 <                        threadShouldThrow();
815 <                    } catch(InterruptedException success){
816 <                    }
817 <                }
818 <            });
819 <        t.start();
820 <        try {
821 <            Thread.sleep(SHORT_DELAY_MS);
822 <            t.interrupt();
823 <            t.join();
824 <        } catch(InterruptedException e){
825 <            unexpectedException();
826 <        }
627 >     * toString indicates current number of permits
628 >     */
629 >    public void testToString()      { testToString(false); }
630 >    public void testToString_fair() { testToString(true); }
631 >    public void testToString(boolean fair) {
632 >        PublicSemaphore s = new PublicSemaphore(0, fair);
633 >        assertTrue(s.toString().contains("Permits = 0"));
634 >        s.release();
635 >        assertTrue(s.toString().contains("Permits = 1"));
636 >        s.release(2);
637 >        assertTrue(s.toString().contains("Permits = 3"));
638 >        s.reducePermits(5);
639 >        assertTrue(s.toString().contains("Permits = -2"));
640      }
641  
829    /**
830     * getQueueLength reports number of waiting threads
831     */
832    public void testGetQueueLength_fair() {
833        final Semaphore lock = new Semaphore(1, true);
834        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
835        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
836        try {
837            assertEquals(0, lock.getQueueLength());
838            lock.acquireUninterruptibly();
839            t1.start();
840            Thread.sleep(SHORT_DELAY_MS);
841            assertEquals(1, lock.getQueueLength());
842            t2.start();
843            Thread.sleep(SHORT_DELAY_MS);
844            assertEquals(2, lock.getQueueLength());
845            t1.interrupt();
846            Thread.sleep(SHORT_DELAY_MS);
847            assertEquals(1, lock.getQueueLength());
848            lock.release();
849            Thread.sleep(SHORT_DELAY_MS);
850            assertEquals(0, lock.getQueueLength());
851            t1.join();
852            t2.join();
853        } catch(Exception e){
854            unexpectedException();
855        }
856    }
857
858
859    /**
860     * a deserialized serialized semaphore has same number of permits
861     */
862    public void testSerialization_fair() {
863        Semaphore l = new Semaphore(3, true);
864
865        try {
866            l.acquire();
867            l.release();
868            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
869            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
870            out.writeObject(l);
871            out.close();
872
873            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
874            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
875            Semaphore r = (Semaphore) in.readObject();
876            assertEquals(3, r.availablePermits());
877            assertTrue(r.isFair());
878            r.acquire();
879            r.release();
880        } catch(Exception e){
881            unexpectedException();
882        }
883    }
884
885
642   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines