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

Comparing jsr166/src/test/tck/SemaphoreTest.java (file contents):
Revision 1.6 by dl, Mon Nov 3 13:50:07 2003 UTC vs.
Revision 1.32 by jsr166, Wed Dec 31 19:05:43 2014 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 < import java.io.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 >
11 > import java.util.Collection;
12 > import java.util.concurrent.CountDownLatch;
13 > import java.util.concurrent.Semaphore;
14 >
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 >        junit.textui.TestRunner.run(suite());
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  
47
58      /**
59 <     * A runnable calling acquire that expects to be
50 <     * interrupted
59 >     * A runnable calling acquire that expects to be interrupted
60       */
61 <    class InterruptedLockRunnable implements Runnable {
61 >    class InterruptedLockRunnable extends CheckedInterruptedRunnable {
62          final Semaphore lock;
63 <        InterruptedLockRunnable(Semaphore l) { lock = l; }
64 <        public void run() {
65 <            try {
66 <                lock.acquire();
67 <                threadShouldThrow();
68 <            } catch(InterruptedException success){}
63 >        InterruptedLockRunnable(Semaphore s) { lock = s; }
64 >        public void realRun() throws InterruptedException {
65 >            lock.acquire();
66 >        }
67 >    }
68 >
69 >    /**
70 >     * Spin-waits until s.hasQueuedThread(t) becomes true.
71 >     */
72 >    void waitForQueuedThread(PublicSemaphore s, Thread t) {
73 >        long startTime = System.nanoTime();
74 >        while (!s.hasQueuedThread(t)) {
75 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
76 >                throw new 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);
160 <        assertEquals(-1, s2.availablePermits());
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 <     * tryAcquire succeeds when sufficent permits, else fails
164 >     * Constructor without fairness argument behaves as nonfair
165       */
166 <    public void testTryAcquireInSameThread() {
167 <        Semaphore s = new Semaphore(2, false);
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 >     * tryAcquire succeeds when sufficient permits, else fails
176 >     */
177 >    public void testTryAcquireInSameThread()      { testTryAcquireInSameThread(false); }
178 >    public void testTryAcquireInSameThread_fair() { testTryAcquireInSameThread(true); }
179 >    public void testTryAcquireInSameThread(boolean fair) {
180 >        Semaphore s = new Semaphore(2, fair);
181          assertEquals(2, s.availablePermits());
182          assertTrue(s.tryAcquire());
183          assertTrue(s.tryAcquire());
184          assertEquals(0, s.availablePermits());
185          assertFalse(s.tryAcquire());
186 +        assertFalse(s.tryAcquire());
187 +        assertEquals(0, s.availablePermits());
188      }
189  
190      /**
191 <     * Acquire and release of semaphore succeed if initially available
191 >     * timed tryAcquire times out
192       */
193 <    public void testAcquireReleaseInSameThread() {
194 <        Semaphore s = new Semaphore(1, false);
195 <        try {
196 <            s.acquire();
197 <            s.release();
198 <            s.acquire();
199 <            s.release();
200 <            s.acquire();
201 <            s.release();
202 <            s.acquire();
203 <            s.release();
204 <            s.acquire();
205 <            s.release();
206 <            assertEquals(1, s.availablePermits());
207 <        } catch( InterruptedException e){
208 <            unexpectedException();
209 <        }
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 >        s.release(2);
308 >
309 >        awaitTermination(t1);
310 >        awaitTermination(t2);
311 >    }
312 >
313 >    /**
314 >     * hasQueuedThreads reports whether there are waiting threads
315 >     */
316 >    public void testHasQueuedThreads()      { 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 <     * Uninterruptible acquire and release of semaphore succeed if
112 <     * initially available
337 >     * getQueueLength reports number of waiting threads
338       */
339 <    public void testAcquireUninterruptiblyReleaseInSameThread() {
340 <        Semaphore s = new Semaphore(1, false);
341 <        try {
342 <            s.acquireUninterruptibly();
343 <            s.release();
344 <            s.acquireUninterruptibly();
345 <            s.release();
346 <            s.acquireUninterruptibly();
347 <            s.release();
348 <            s.acquireUninterruptibly();
349 <            s.release();
350 <            s.acquireUninterruptibly();
351 <            s.release();
352 <            assertEquals(1, s.availablePermits());
353 <        } finally {
354 <        }
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 <     * Timed Acquire and release of semaphore succeed if
134 <     * initially available
360 >     * getQueuedThreads includes waiting threads
361       */
362 <    public void testTimedAcquireReleaseInSameThread() {
363 <        Semaphore s = new Semaphore(1, false);
364 <        try {
365 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
366 <            s.release();
367 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
368 <            s.release();
369 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
370 <            s.release();
371 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
372 <            s.release();
373 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
374 <            s.release();
375 <            assertEquals(1, s.availablePermits());
376 <        } catch( InterruptedException e){
377 <            unexpectedException();
378 <        }
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 <     * A release in one thread enables an acquire in another thread
387 <     */
388 <    public void testAcquireReleaseInDifferentThreads() {
389 <        final Semaphore s = new Semaphore(0, false);
390 <        Thread t = new Thread(new Runnable() {
391 <                public void run() {
392 <                    try {
393 <                        s.acquire();
394 <                        s.release();
395 <                        s.release();
396 <                        s.acquire();
397 <                    } catch(InterruptedException ie){
398 <                        threadUnexpectedException();
169 <                    }
170 <                }
171 <            });
172 <        try {
173 <            t.start();
174 <            Thread.sleep(SHORT_DELAY_MS);
175 <            s.release();
176 <            s.release();
177 <            s.acquire();
178 <            s.acquire();
179 <            s.release();
180 <            t.join();
181 <        } catch( InterruptedException e){
182 <            unexpectedException();
183 <        }
386 >     * drainPermits reports and removes given number of permits
387 >     */
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);
395 >        assertEquals(10, s.availablePermits());
396 >        assertEquals(10, s.drainPermits());
397 >        assertEquals(0, s.availablePermits());
398 >        assertEquals(0, s.drainPermits());
399      }
400  
401      /**
402 <     * A release in one thread enables an uninterruptible acquire in another thread
402 >     * release(-N) throws IllegalArgumentException
403       */
404 <    public void testUninterruptibleAcquireReleaseInDifferentThreads() {
405 <        final Semaphore s = new Semaphore(0, false);
406 <        Thread t = new Thread(new Runnable() {
407 <                public void run() {
193 <                    s.acquireUninterruptibly();
194 <                    s.release();
195 <                    s.release();
196 <                    s.acquireUninterruptibly();
197 <                }
198 <            });
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 <            t.start();
410 <            Thread.sleep(SHORT_DELAY_MS);
411 <            s.release();
203 <            s.release();
204 <            s.acquireUninterruptibly();
205 <            s.acquireUninterruptibly();
206 <            s.release();
207 <            t.join();
208 <        } catch( InterruptedException e){
209 <            unexpectedException();
210 <        }
409 >            s.release(-1);
410 >            shouldThrow();
411 >        } catch (IllegalArgumentException success) {}
412      }
413  
213
414      /**
415 <     *  A release in one thread enables a timed acquire in another thread
415 >     * reducePermits(-N) throws IllegalArgumentException
416       */
417 <    public void testTimedAcquireReleaseInDifferentThreads() {
418 <        final Semaphore s = new Semaphore(1, false);
419 <        Thread t = new Thread(new Runnable() {
420 <                public void run() {
221 <                    try {
222 <                        s.release();
223 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
224 <                        s.release();
225 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
226 <
227 <                    } catch(InterruptedException ie){
228 <                        threadUnexpectedException();
229 <                    }
230 <                }
231 <            });
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 <            t.start();
423 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
424 <            s.release();
236 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
237 <            s.release();
238 <            s.release();
239 <            t.join();
240 <        } catch( InterruptedException e){
241 <            unexpectedException();
242 <        }
243 <    }
244 <
245 <    /**
246 <     * A waiting acquire blocks interruptibly
247 <     */
248 <    public void testAcquire_InterruptedException() {
249 <        final Semaphore s = new Semaphore(0, false);
250 <        Thread t = new Thread(new Runnable() {
251 <                public void run() {
252 <                    try {
253 <                        s.acquire();
254 <                        threadShouldThrow();
255 <                    } catch(InterruptedException success){}
256 <                }
257 <            });
258 <        t.start();
259 <        try {
260 <            Thread.sleep(SHORT_DELAY_MS);
261 <            t.interrupt();
262 <            t.join();
263 <        } catch(InterruptedException e){
264 <            unexpectedException();
265 <        }
266 <    }
267 <    
268 <    /**
269 <     *  A waiting timed acquire blocks interruptibly
270 <     */
271 <    public void testTryAcquire_InterruptedException() {
272 <        final Semaphore s = new Semaphore(0, false);
273 <        Thread t = new Thread(new Runnable() {
274 <                public void run() {
275 <                    try {
276 <                        s.tryAcquire(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
277 <                        threadShouldThrow();
278 <                    } catch(InterruptedException success){
279 <                    }
280 <                }
281 <            });
282 <        t.start();
283 <        try {
284 <            Thread.sleep(SHORT_DELAY_MS);
285 <            t.interrupt();
286 <            t.join();
287 <        } catch(InterruptedException e){
288 <            unexpectedException();
289 <        }
422 >            s.reducePermits(-1);
423 >            shouldThrow();
424 >        } catch (IllegalArgumentException success) {}
425      }
426  
427      /**
293     * getQueueLength reports number of waiting threads
294     */
295    public void testGetQueueLength() {
296        final Semaphore lock = new Semaphore(1, false);
297        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
298        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
299        try {
300            assertEquals(0, lock.getQueueLength());
301            lock.acquireUninterruptibly();
302            t1.start();
303            Thread.sleep(SHORT_DELAY_MS);
304            assertEquals(1, lock.getQueueLength());
305            t2.start();
306            Thread.sleep(SHORT_DELAY_MS);
307            assertEquals(2, lock.getQueueLength());
308            t1.interrupt();
309            Thread.sleep(SHORT_DELAY_MS);
310            assertEquals(1, lock.getQueueLength());
311            lock.release();
312            Thread.sleep(SHORT_DELAY_MS);
313            assertEquals(0, lock.getQueueLength());
314            t1.join();
315            t2.join();
316        } catch(Exception e){
317            unexpectedException();
318        }
319    }
320
321    /**
322     * getQueuedThreads includes waiting threads
323     */
324    public void testGetQueuedThreads() {
325        final PublicSemaphore lock = new PublicSemaphore(1, false);
326        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
327        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
328        try {
329            assertTrue(lock.getQueuedThreads().isEmpty());
330            lock.acquireUninterruptibly();
331            assertTrue(lock.getQueuedThreads().isEmpty());
332            t1.start();
333            Thread.sleep(SHORT_DELAY_MS);
334            assertTrue(lock.getQueuedThreads().contains(t1));
335            t2.start();
336            Thread.sleep(SHORT_DELAY_MS);
337            assertTrue(lock.getQueuedThreads().contains(t1));
338            assertTrue(lock.getQueuedThreads().contains(t2));
339            t1.interrupt();
340            Thread.sleep(SHORT_DELAY_MS);
341            assertFalse(lock.getQueuedThreads().contains(t1));
342            assertTrue(lock.getQueuedThreads().contains(t2));
343            lock.release();
344            Thread.sleep(SHORT_DELAY_MS);
345            assertTrue(lock.getQueuedThreads().isEmpty());
346            t1.join();
347            t2.join();
348        } catch(Exception e){
349            unexpectedException();
350        }
351    }
352
353
354    /**
428       * reducePermits reduces number of permits
429       */
430 <    public void testReducePermits() {
431 <        PublicSemaphore s = new PublicSemaphore(10, false);
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 <     * a deserialized serialized semaphore has same number of permits
448 >     * a reserialized semaphore has same number of permits and
449 >     * fairness, but no queued threads
450       */
451 <    public void testSerialization() {
452 <        Semaphore l = new Semaphore(3, false);
451 >    public void testSerialization()      { testSerialization(false); }
452 >    public void testSerialization_fair() { testSerialization(true); }
453 >    public void testSerialization(boolean fair) {
454          try {
455 <            l.acquire();
456 <            l.release();
457 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
458 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
376 <            out.writeObject(l);
377 <            out.close();
378 <
379 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
380 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
381 <            Semaphore r = (Semaphore) in.readObject();
382 <            assertEquals(3, r.availablePermits());
383 <            assertFalse(r.isFair());
384 <            r.acquire();
385 <            r.release();
386 <        } catch(Exception e){
387 <            unexpectedException();
388 <        }
389 <    }
455 >            Semaphore s = new Semaphore(3, fair);
456 >            s.acquire();
457 >            s.acquire();
458 >            s.release();
459  
460 +            Semaphore clone = serialClone(s);
461 +            assertEquals(fair, s.isFair());
462 +            assertEquals(fair, clone.isFair());
463 +            assertEquals(2, s.availablePermits());
464 +            assertEquals(2, clone.availablePermits());
465 +            clone.acquire();
466 +            clone.acquire();
467 +            clone.release();
468 +            assertEquals(2, s.availablePermits());
469 +            assertEquals(1, clone.availablePermits());
470  
471 <    /**
472 <     * Zero, negative, and positive initial values are allowed in constructor
473 <     */
474 <    public void testConstructor_fair() {
475 <        Semaphore s0 = new Semaphore(0, true);
476 <        assertEquals(0, s0.availablePermits());
477 <        assertTrue(s0.isFair());
478 <        Semaphore s1 = new Semaphore(-1, true);
479 <        assertEquals(-1, s1.availablePermits());
480 <        Semaphore s2 = new Semaphore(-1, true);
481 <        assertEquals(-1, s2.availablePermits());
471 >            s = new Semaphore(0, fair);
472 >            Thread t = newStartedThread(new InterruptibleLockRunnable(s));
473 >            waitForQueuedThreads(s);
474 >            clone = serialClone(s);
475 >            assertEquals(fair, s.isFair());
476 >            assertEquals(fair, clone.isFair());
477 >            assertEquals(0, s.availablePermits());
478 >            assertEquals(0, clone.availablePermits());
479 >            assertTrue(s.hasQueuedThreads());
480 >            assertFalse(clone.hasQueuedThreads());
481 >            s.release();
482 >            awaitTermination(t);
483 >            assertFalse(s.hasQueuedThreads());
484 >            assertFalse(clone.hasQueuedThreads());
485 >        } catch (InterruptedException e) { threadUnexpectedException(e); }
486      }
487  
488      /**
489 <     * tryAcquire succeeds when sufficent permits, else fails
490 <     */
491 <    public void testTryAcquireInSameThread_fair() {
492 <        Semaphore s = new Semaphore(2, true);
489 >     * tryAcquire(n) succeeds when sufficient permits, else fails
490 >     */
491 >    public void testTryAcquireNInSameThread()      { testTryAcquireNInSameThread(false); }
492 >    public void testTryAcquireNInSameThread_fair() { testTryAcquireNInSameThread(true); }
493 >    public void testTryAcquireNInSameThread(boolean fair) {
494 >        Semaphore s = new Semaphore(2, fair);
495          assertEquals(2, s.availablePermits());
496 <        assertTrue(s.tryAcquire());
412 <        assertTrue(s.tryAcquire());
413 <        assertEquals(0, s.availablePermits());
414 <        assertFalse(s.tryAcquire());
415 <    }
416 <
417 <    /**
418 <     * tryAcquire(n) succeeds when sufficent permits, else fails
419 <     */
420 <    public void testTryAcquireNInSameThread_fair() {
421 <        Semaphore s = new Semaphore(2, true);
496 >        assertFalse(s.tryAcquire(3));
497          assertEquals(2, s.availablePermits());
498          assertTrue(s.tryAcquire(2));
499          assertEquals(0, s.availablePermits());
500 <        assertFalse(s.tryAcquire());
501 <    }
502 <
428 <    /**
429 <     * Acquire and release of semaphore succeed if initially available
430 <     */
431 <    public void testAcquireReleaseInSameThread_fair() {
432 <        Semaphore s = new Semaphore(1, true);
433 <        try {
434 <            s.acquire();
435 <            s.release();
436 <            s.acquire();
437 <            s.release();
438 <            s.acquire();
439 <            s.release();
440 <            s.acquire();
441 <            s.release();
442 <            s.acquire();
443 <            s.release();
444 <            assertEquals(1, s.availablePermits());
445 <        } catch( InterruptedException e){
446 <            unexpectedException();
447 <        }
448 <    }
449 <
450 <    /**
451 <     * Acquire(n) and release(n) of semaphore succeed if initially available
452 <     */
453 <    public void testAcquireReleaseNInSameThread_fair() {
454 <        Semaphore s = new Semaphore(1, true);
455 <        try {
456 <            s.release(1);
457 <            s.acquire(1);
458 <            s.release(2);
459 <            s.acquire(2);
460 <            s.release(3);
461 <            s.acquire(3);
462 <            s.release(4);
463 <            s.acquire(4);
464 <            s.release(5);
465 <            s.acquire(5);
466 <            assertEquals(1, s.availablePermits());
467 <        } catch( InterruptedException e){
468 <            unexpectedException();
469 <        }
470 <    }
471 <
472 <    /**
473 <     * Acquire(n) and release(n) of semaphore succeed if initially available
474 <     */
475 <    public void testAcquireUninterruptiblyReleaseNInSameThread_fair() {
476 <        Semaphore s = new Semaphore(1, true);
477 <        try {
478 <            s.release(1);
479 <            s.acquireUninterruptibly(1);
480 <            s.release(2);
481 <            s.acquireUninterruptibly(2);
482 <            s.release(3);
483 <            s.acquireUninterruptibly(3);
484 <            s.release(4);
485 <            s.acquireUninterruptibly(4);
486 <            s.release(5);
487 <            s.acquireUninterruptibly(5);
488 <            assertEquals(1, s.availablePermits());
489 <        } finally {
490 <        }
491 <    }
492 <
493 <    /**
494 <     * release(n) in one thread enables timed acquire(n) in another thread
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);
508 <            assertTrue(s.tryAcquire(5, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
509 <            assertEquals(1, s.availablePermits());
510 <        } catch( InterruptedException e){
511 <            unexpectedException();
512 <        }
500 >        assertFalse(s.tryAcquire(1));
501 >        assertFalse(s.tryAcquire(2));
502 >        assertEquals(0, s.availablePermits());
503      }
504  
505      /**
506 <     * release in one thread enables timed acquire in another thread
506 >     * acquire succeeds if permits available
507       */
508 <    public void testTimedAcquireReleaseInSameThread_fair() {
509 <        Semaphore s = new Semaphore(1, true);
510 <        try {
511 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
512 <            s.release();
513 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
514 <            s.release();
515 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
516 <            s.release();
517 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
518 <            s.release();
519 <            assertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
520 <            s.release();
508 >    public void testReleaseAcquireSameThread_acquire()       { testReleaseAcquireSameThread(false, AcquireMethod.acquire); }
509 >    public void testReleaseAcquireSameThread_acquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquire); }
510 >    public void testReleaseAcquireSameThread_acquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireN); }
511 >    public void testReleaseAcquireSameThread_acquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireN); }
512 >    public void testReleaseAcquireSameThread_acquireUninterruptibly()       { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
513 >    public void testReleaseAcquireSameThread_acquireUninterruptibly_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
514 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
515 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
516 >    public void testReleaseAcquireSameThread_tryAcquire()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquire); }
517 >    public void testReleaseAcquireSameThread_tryAcquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquire); }
518 >    public void testReleaseAcquireSameThread_tryAcquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireN); }
519 >    public void testReleaseAcquireSameThread_tryAcquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireN); }
520 >    public void testReleaseAcquireSameThread_tryAcquireTimed()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimed); }
521 >    public void testReleaseAcquireSameThread_tryAcquireTimed_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimed); }
522 >    public void testReleaseAcquireSameThread_tryAcquireTimedN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimedN); }
523 >    public void testReleaseAcquireSameThread_tryAcquireTimedN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimedN); }
524 >    public void testReleaseAcquireSameThread(boolean fair,
525 >                                             final AcquireMethod acquirer) {
526 >        Semaphore s = new Semaphore(1, fair);
527 >        for (int i = 1; i < 6; i++) {
528 >            s.release(i);
529 >            assertEquals(1 + i, s.availablePermits());
530 >            try {
531 >                acquirer.acquire(s, i);
532 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
533              assertEquals(1, s.availablePermits());
532        } catch( InterruptedException e){
533            unexpectedException();
534        }
535    }
536
537    /**
538     * A release in one thread enables an acquire in another thread
539     */
540    public void testAcquireReleaseInDifferentThreads_fair() {
541        final Semaphore s = new Semaphore(0, true);
542        Thread t = new Thread(new Runnable() {
543                public void run() {
544                    try {
545                        s.acquire();
546                        s.acquire();
547                        s.acquire();
548                        s.acquire();
549                    } catch(InterruptedException ie){
550                        threadUnexpectedException();
551                    }
552                }
553            });
554        try {
555            t.start();
556            Thread.sleep(SHORT_DELAY_MS);
557            s.release();
558            s.release();
559            s.release();
560            s.release();
561            s.release();
562            s.release();
563            t.join();
564            assertEquals(2, s.availablePermits());
565        } catch( InterruptedException e){
566            unexpectedException();
534          }
535      }
536  
537      /**
538 <     * release(n) in one thread enables acquire(n) in another thread
538 >     * release in one thread enables acquire in another thread
539       */
540 <    public void testAcquireReleaseNInDifferentThreads_fair() {
541 <        final Semaphore s = new Semaphore(0, true);
542 <        Thread t = new Thread(new Runnable() {
543 <                public void run() {
544 <                    try {
545 <                        s.acquire(2);
546 <                        s.acquire(2);
547 <                        s.release(4);
548 <                    } catch(InterruptedException ie){
549 <                        threadUnexpectedException();
550 <                    }
551 <                }
552 <            });
553 <        try {
554 <            t.start();
555 <            Thread.sleep(SHORT_DELAY_MS);
556 <            s.release(6);
557 <            s.acquire(2);
558 <            s.acquire(2);
559 <            s.release(2);
560 <            t.join();
561 <        } catch( InterruptedException e){
562 <            unexpectedException();
563 <        }
564 <    }
565 <
566 <
567 <
568 <    /**
569 <     * release in one thread enables timed acquire in another thread
570 <     */
571 <    public void testTimedAcquireReleaseInDifferentThreads_fair() {
572 <        final Semaphore s = new Semaphore(1, true);
573 <        Thread t = new Thread(new Runnable() {
574 <                public void run() {
608 <                    try {
609 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
610 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
611 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
612 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
613 <                        threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
614 <
615 <                    } catch(InterruptedException ie){
616 <                        threadUnexpectedException();
617 <                    }
618 <                }
619 <            });
620 <        t.start();
621 <        try {
622 <            s.release();
623 <            s.release();
624 <            s.release();
625 <            s.release();
626 <            s.release();
627 <            t.join();
628 <        } catch( InterruptedException e){
629 <            unexpectedException();
630 <        }
631 <    }
632 <
633 <    /**
634 <     * release(n) in one thread enables timed acquire(n) in another thread
635 <     */
636 <    public void testTimedAcquireReleaseNInDifferentThreads_fair() {
637 <        final Semaphore s = new Semaphore(2, true);
638 <        Thread t = new Thread(new Runnable() {
639 <                public void run() {
640 <                    try {
641 <                        threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
642 <                        s.release(2);
643 <                        threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
644 <                        s.release(2);
645 <                    } catch(InterruptedException ie){
646 <                        threadUnexpectedException();
647 <                    }
648 <                }
649 <            });
650 <        t.start();
651 <        try {
652 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
653 <            s.release(2);
654 <            assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
655 <            s.release(2);
656 <            t.join();
657 <        } catch( InterruptedException e){
658 <            unexpectedException();
659 <        }
660 <    }
661 <
662 <    /**
663 <     * A waiting acquire blocks interruptibly
664 <     */
665 <    public void testAcquire_InterruptedException_fair() {
666 <        final Semaphore s = new Semaphore(0, true);
667 <        Thread t = new Thread(new Runnable() {
668 <                public void run() {
669 <                    try {
670 <                        s.acquire();
671 <                        threadShouldThrow();
672 <                    } catch(InterruptedException success){}
673 <                }
674 <            });
675 <        t.start();
676 <        try {
677 <            Thread.sleep(SHORT_DELAY_MS);
678 <            t.interrupt();
679 <            t.join();
680 <        } catch(InterruptedException e){
681 <            unexpectedException();
682 <        }
683 <    }
684 <
685 <    /**
686 <     * A waiting acquire(n) blocks interruptibly
687 <     */
688 <    public void testAcquireN_InterruptedException_fair() {
689 <        final Semaphore s = new Semaphore(2, true);
690 <        Thread t = new Thread(new Runnable() {
691 <                public void run() {
692 <                    try {
693 <                        s.acquire(3);
694 <                        threadShouldThrow();
695 <                    } catch(InterruptedException success){}
696 <                }
697 <            });
698 <        t.start();
699 <        try {
700 <            Thread.sleep(SHORT_DELAY_MS);
701 <            t.interrupt();
702 <            t.join();
703 <        } catch(InterruptedException e){
704 <            unexpectedException();
705 <        }
706 <    }
707 <    
708 <    /**
709 <     *  A waiting tryAcquire blocks interruptibly
710 <     */
711 <    public void testTryAcquire_InterruptedException_fair() {
712 <        final Semaphore s = new Semaphore(0, true);
713 <        Thread t = new Thread(new Runnable() {
714 <                public void run() {
715 <                    try {
716 <                        s.tryAcquire(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
717 <                        threadShouldThrow();
718 <                    } catch(InterruptedException success){
719 <                    }
720 <                }
721 <            });
722 <        t.start();
723 <        try {
724 <            Thread.sleep(SHORT_DELAY_MS);
725 <            t.interrupt();
726 <            t.join();
727 <        } catch(InterruptedException e){
728 <            unexpectedException();
729 <        }
730 <    }
731 <
732 <    /**
733 <     *  A waiting tryAcquire(n) blocks interruptibly
734 <     */
735 <    public void testTryAcquireN_InterruptedException_fair() {
736 <        final Semaphore s = new Semaphore(1, true);
737 <        Thread t = new Thread(new Runnable() {
738 <                public void run() {
739 <                    try {
740 <                        s.tryAcquire(4, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
741 <                        threadShouldThrow();
742 <                    } catch(InterruptedException success){
743 <                    }
744 <                }
745 <            });
746 <        t.start();
747 <        try {
748 <            Thread.sleep(SHORT_DELAY_MS);
749 <            t.interrupt();
750 <            t.join();
751 <        } catch(InterruptedException e){
752 <            unexpectedException();
540 >    public void testReleaseAcquireDifferentThreads_acquire()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquire); }
541 >    public void testReleaseAcquireDifferentThreads_acquire_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquire); }
542 >    public void testReleaseAcquireDifferentThreads_acquireN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireN); }
543 >    public void testReleaseAcquireDifferentThreads_acquireN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireN); }
544 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
545 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
546 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
547 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
548 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimed); }
549 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimed); }
550 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimedN); }
551 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimedN); }
552 >    public void testReleaseAcquireDifferentThreads(boolean fair,
553 >                                                   final AcquireMethod acquirer) {
554 >        final Semaphore s = new Semaphore(0, fair);
555 >        final int rounds = 4;
556 >        long startTime = System.nanoTime();
557 >        Thread t = newStartedThread(new CheckedRunnable() {
558 >            public void realRun() throws InterruptedException {
559 >                for (int i = 0; i < rounds; i++) {
560 >                    assertFalse(s.hasQueuedThreads());
561 >                    if (i % 2 == 0)
562 >                        acquirer.acquire(s);
563 >                    else
564 >                        acquirer.acquire(s, 3);
565 >                }}});
566 >
567 >        for (int i = 0; i < rounds; i++) {
568 >            while (! (s.availablePermits() == 0 && s.hasQueuedThreads()))
569 >                Thread.yield();
570 >            assertTrue(t.isAlive());
571 >            if (i % 2 == 0)
572 >                s.release();
573 >            else
574 >                s.release(3);
575          }
576 +        awaitTermination(t);
577 +        assertEquals(0, s.availablePermits());
578 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
579      }
580  
581      /**
582 <     * getQueueLength reports number of waiting threads
758 <     */
759 <    public void testGetQueueLength_fair() {
760 <        final Semaphore lock = new Semaphore(1, true);
761 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
762 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
763 <        try {
764 <            assertEquals(0, lock.getQueueLength());
765 <            lock.acquireUninterruptibly();
766 <            t1.start();
767 <            Thread.sleep(SHORT_DELAY_MS);
768 <            assertEquals(1, lock.getQueueLength());
769 <            t2.start();
770 <            Thread.sleep(SHORT_DELAY_MS);
771 <            assertEquals(2, lock.getQueueLength());
772 <            t1.interrupt();
773 <            Thread.sleep(SHORT_DELAY_MS);
774 <            assertEquals(1, lock.getQueueLength());
775 <            lock.release();
776 <            Thread.sleep(SHORT_DELAY_MS);
777 <            assertEquals(0, lock.getQueueLength());
778 <            t1.join();
779 <            t2.join();
780 <        } catch(Exception e){
781 <            unexpectedException();
782 <        }
783 <    }
784 <
785 <
786 <    /**
787 <     * a deserialized serialized semaphore has same number of permits
582 >     * fair locks are strictly FIFO
583       */
584 <    public void testSerialization_fair() {
585 <        Semaphore l = new Semaphore(3, true);
586 <
587 <        try {
588 <            l.acquire();
589 <            l.release();
590 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
591 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
592 <            out.writeObject(l);
593 <            out.close();
594 <
595 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
596 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
597 <            Semaphore r = (Semaphore) in.readObject();
598 <            assertEquals(3, r.availablePermits());
599 <            assertTrue(r.isFair());
600 <            r.acquire();
601 <            r.release();
602 <        } catch(Exception e){
603 <            unexpectedException();
604 <        }
584 >    public void testFairLocksFifo() {
585 >        final PublicSemaphore s = new PublicSemaphore(1, true);
586 >        final CountDownLatch pleaseRelease = new CountDownLatch(1);
587 >        Thread t1 = newStartedThread(new CheckedRunnable() {
588 >            public void realRun() throws InterruptedException {
589 >                // Will block; permits are available, but not three
590 >                s.acquire(3);
591 >            }});
592 >
593 >        waitForQueuedThreads(s);
594 >
595 >        Thread t2 = newStartedThread(new CheckedRunnable() {
596 >            public void realRun() throws InterruptedException {
597 >                // Will fail, even though 1 permit is available
598 >                assertFalse(s.tryAcquire(0L, MILLISECONDS));
599 >                assertFalse(s.tryAcquire(1, 0L, MILLISECONDS));
600 >
601 >                // untimed tryAcquire will barge and succeed
602 >                assertTrue(s.tryAcquire());
603 >                s.release(2);
604 >                assertTrue(s.tryAcquire(2));
605 >                s.release();
606 >
607 >                pleaseRelease.countDown();
608 >                // Will queue up behind t1, even though 1 permit is available
609 >                s.acquire();
610 >            }});
611 >
612 >        await(pleaseRelease);
613 >        waitForQueuedThread(s, t2);
614 >        s.release(2);
615 >        awaitTermination(t1);
616 >        assertTrue(t2.isAlive());
617 >        s.release();
618 >        awaitTermination(t2);
619 >   }
620 >
621 >    /**
622 >     * toString indicates current number of permits
623 >     */
624 >    public void testToString()      { testToString(false); }
625 >    public void testToString_fair() { testToString(true); }
626 >    public void testToString(boolean fair) {
627 >        PublicSemaphore s = new PublicSemaphore(0, fair);
628 >        assertTrue(s.toString().contains("Permits = 0"));
629 >        s.release();
630 >        assertTrue(s.toString().contains("Permits = 1"));
631 >        s.release(2);
632 >        assertTrue(s.toString().contains("Permits = 3"));
633 >        s.reducePermits(5);
634 >        assertTrue(s.toString().contains("Permits = -2"));
635      }
636  
812
637   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines