155 |
|
enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil } |
156 |
|
|
157 |
|
/** |
158 |
< |
* Awaits condition using the specified AwaitMethod. |
158 |
> |
* Awaits condition "indefinitely" using the specified AwaitMethod. |
159 |
|
*/ |
160 |
|
void await(Condition c, AwaitMethod awaitMethod) |
161 |
|
throws InterruptedException { |
162 |
+ |
long timeoutMillis = 2 * LONG_DELAY_MS; |
163 |
|
switch (awaitMethod) { |
164 |
|
case await: |
165 |
|
c.await(); |
166 |
|
break; |
167 |
|
case awaitTimed: |
168 |
< |
assertTrue(c.await(2 * LONG_DELAY_MS, MILLISECONDS)); |
168 |
> |
assertTrue(c.await(timeoutMillis, MILLISECONDS)); |
169 |
|
break; |
170 |
|
case awaitNanos: |
171 |
< |
long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS)); |
172 |
< |
assertTrue(nanosRemaining > 0); |
171 |
> |
long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis); |
172 |
> |
long nanosRemaining = c.awaitNanos(timeoutNanos); |
173 |
> |
assertTrue(nanosRemaining > timeoutNanos / 2); |
174 |
> |
assertTrue(nanosRemaining <= timeoutNanos); |
175 |
|
break; |
176 |
|
case awaitUntil: |
177 |
< |
java.util.Date d = new java.util.Date(); |
175 |
< |
assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS))); |
177 |
> |
assertTrue(c.awaitUntil(delayedDate(timeoutMillis))); |
178 |
|
break; |
179 |
|
default: |
180 |
|
throw new AssertionError(); |
238 |
|
} |
239 |
|
for (int i = SIZE; i > 0; i--) { |
240 |
|
lock.writeLock().unlock(); |
241 |
< |
assertEquals(i-1,lock.getWriteHoldCount()); |
241 |
> |
assertEquals(i - 1,lock.getWriteHoldCount()); |
242 |
|
} |
243 |
|
} |
244 |
|
|
255 |
|
} |
256 |
|
for (int i = SIZE; i > 0; i--) { |
257 |
|
lock.writeLock().unlock(); |
258 |
< |
assertEquals(i-1,lock.writeLock().getHoldCount()); |
258 |
> |
assertEquals(i - 1,lock.writeLock().getHoldCount()); |
259 |
|
} |
260 |
|
} |
261 |
|
|
272 |
|
} |
273 |
|
for (int i = SIZE; i > 0; i--) { |
274 |
|
lock.readLock().unlock(); |
275 |
< |
assertEquals(i-1,lock.getReadHoldCount()); |
275 |
> |
assertEquals(i - 1,lock.getReadHoldCount()); |
276 |
|
} |
277 |
|
} |
278 |
|
|
969 |
|
new ReentrantReadWriteLock(fair); |
970 |
|
final Condition c = lock.writeLock().newCondition(); |
971 |
|
lock.writeLock().lock(); |
972 |
< |
long startTime = System.nanoTime(); |
973 |
< |
long timeoutMillis = 10; |
974 |
< |
java.util.Date d = new java.util.Date(); |
975 |
< |
assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis))); |
976 |
< |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
972 |
> |
// We shouldn't assume that nanoTime and currentTimeMillis |
973 |
> |
// use the same time source, so don't use nanoTime here. |
974 |
> |
java.util.Date delayedDate = delayedDate(timeoutMillis()); |
975 |
> |
assertFalse(c.awaitUntil(delayedDate)); |
976 |
> |
assertTrue(new java.util.Date().getTime() >= delayedDate.getTime()); |
977 |
|
lock.writeLock().unlock(); |
978 |
|
} catch (InterruptedException fail) { threadUnexpectedException(fail); } |
979 |
|
} |