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.22 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.38 by jsr166, Sun May 14 00:38:16 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines