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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines