59 |
|
} |
60 |
|
|
61 |
|
/** |
62 |
< |
* Releases lock, checking that it had a hold count of 1. |
62 |
> |
* Releases write lock, checking that it had a hold count of 1. |
63 |
|
*/ |
64 |
< |
void releaseLock(ReentrantReadWriteLock.WriteLock lock) { |
65 |
< |
assertTrue(lock.isHeldByCurrentThread()); |
66 |
< |
lock.unlock(); |
67 |
< |
assertFalse(lock.isHeldByCurrentThread()); |
64 |
> |
void releaseWriteLock(ReentrantReadWriteLock lock) { |
65 |
> |
ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock(); |
66 |
> |
assertTrue(writeLock.isHeldByCurrentThread()); |
67 |
> |
writeLock.unlock(); |
68 |
> |
assertFalse(writeLock.isHeldByCurrentThread()); |
69 |
|
} |
70 |
|
|
71 |
|
/** |
208 |
|
|
209 |
|
Thread.sleep(SHORT_DELAY_MS); |
210 |
|
t.interrupt(); |
211 |
< |
t.join(); |
212 |
< |
releaseLock(lock.writeLock()); |
211 |
> |
awaitTermination(t, LONG_DELAY_MS); |
212 |
> |
releaseWriteLock(lock); |
213 |
|
} |
214 |
|
|
215 |
|
/** |
225 |
|
|
226 |
|
Thread.sleep(SHORT_DELAY_MS); |
227 |
|
t.interrupt(); |
228 |
< |
t.join(); |
229 |
< |
releaseLock(lock.writeLock()); |
228 |
> |
awaitTermination(t, LONG_DELAY_MS); |
229 |
> |
releaseWriteLock(lock); |
230 |
|
} |
231 |
|
|
232 |
|
/** |
242 |
|
|
243 |
|
Thread.sleep(SHORT_DELAY_MS); |
244 |
|
t.interrupt(); |
245 |
< |
t.join(); |
246 |
< |
releaseLock(lock.writeLock()); |
245 |
> |
awaitTermination(t, LONG_DELAY_MS); |
246 |
> |
releaseWriteLock(lock); |
247 |
|
} |
248 |
|
|
249 |
|
/** |
259 |
|
|
260 |
|
Thread.sleep(SHORT_DELAY_MS); |
261 |
|
t.interrupt(); |
262 |
< |
t.join(); |
263 |
< |
releaseLock(lock.writeLock()); |
262 |
> |
awaitTermination(t, LONG_DELAY_MS); |
263 |
> |
releaseWriteLock(lock); |
264 |
|
} |
265 |
|
|
266 |
|
|
275 |
|
assertFalse(lock.writeLock().tryLock()); |
276 |
|
}}); |
277 |
|
|
278 |
< |
t.join(); |
279 |
< |
lock.writeLock().unlock(); |
278 |
> |
awaitTermination(t, LONG_DELAY_MS); |
279 |
> |
releaseWriteLock(lock); |
280 |
|
} |
281 |
|
|
282 |
|
/** |
290 |
|
assertFalse(lock.readLock().tryLock()); |
291 |
|
}}); |
292 |
|
|
293 |
< |
t.join(); |
294 |
< |
lock.writeLock().unlock(); |
293 |
> |
awaitTermination(t, LONG_DELAY_MS); |
294 |
> |
releaseWriteLock(lock); |
295 |
|
} |
296 |
|
|
297 |
|
/** |
306 |
|
lock.readLock().unlock(); |
307 |
|
}}); |
308 |
|
|
309 |
< |
t.join(); |
309 |
> |
awaitTermination(t, LONG_DELAY_MS); |
310 |
|
lock.readLock().unlock(); |
311 |
|
} |
312 |
|
|
329 |
|
|
330 |
|
Thread.sleep(SHORT_DELAY_MS); |
331 |
|
lock.readLock().unlock(); |
332 |
< |
t1.join(MEDIUM_DELAY_MS); |
333 |
< |
t2.join(MEDIUM_DELAY_MS); |
333 |
< |
assertTrue(!t1.isAlive()); |
334 |
< |
assertTrue(!t2.isAlive()); |
332 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
333 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
334 |
|
} |
335 |
|
|
336 |
|
/** |
351 |
|
}}); |
352 |
|
|
353 |
|
Thread.sleep(SHORT_DELAY_MS); |
354 |
< |
lock.writeLock().unlock(); |
355 |
< |
t1.join(MEDIUM_DELAY_MS); |
356 |
< |
t2.join(MEDIUM_DELAY_MS); |
358 |
< |
assertTrue(!t1.isAlive()); |
359 |
< |
assertTrue(!t2.isAlive()); |
354 |
> |
releaseWriteLock(lock); |
355 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
356 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
357 |
|
} |
358 |
|
|
359 |
|
/** |
391 |
|
lock.readLock().lock(); |
392 |
|
lock.readLock().unlock(); |
393 |
|
lock.writeLock().unlock(); |
394 |
< |
t1.join(MEDIUM_DELAY_MS); |
395 |
< |
t2.join(MEDIUM_DELAY_MS); |
399 |
< |
assertTrue(!t1.isAlive()); |
400 |
< |
assertTrue(!t2.isAlive()); |
394 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
395 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
396 |
|
} |
397 |
|
|
398 |
|
/** |
419 |
|
lock.readLock().lock(); |
420 |
|
lock.readLock().unlock(); |
421 |
|
lock.writeLock().unlock(); |
422 |
< |
t1.join(MEDIUM_DELAY_MS); |
423 |
< |
t2.join(MEDIUM_DELAY_MS); |
429 |
< |
assertTrue(!t1.isAlive()); |
430 |
< |
assertTrue(!t2.isAlive()); |
422 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
423 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
424 |
|
} |
425 |
|
|
426 |
|
|
448 |
|
lock.writeLock().lock(); |
449 |
|
lock.writeLock().unlock(); |
450 |
|
lock.writeLock().unlock(); |
451 |
< |
t1.join(MEDIUM_DELAY_MS); |
452 |
< |
t2.join(MEDIUM_DELAY_MS); |
460 |
< |
assertTrue(!t1.isAlive()); |
461 |
< |
assertTrue(!t2.isAlive()); |
451 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
452 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
453 |
|
} |
454 |
|
|
455 |
|
|
488 |
|
lock.readLock().lock(); |
489 |
|
lock.readLock().unlock(); |
490 |
|
lock.writeLock().unlock(); |
491 |
< |
t1.join(MEDIUM_DELAY_MS); |
492 |
< |
t2.join(MEDIUM_DELAY_MS); |
502 |
< |
assertTrue(!t1.isAlive()); |
503 |
< |
assertTrue(!t2.isAlive()); |
491 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
492 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
493 |
|
} |
494 |
|
|
495 |
|
|
517 |
|
lock.readLock().lock(); |
518 |
|
lock.readLock().unlock(); |
519 |
|
lock.writeLock().unlock(); |
520 |
< |
t1.join(MEDIUM_DELAY_MS); |
521 |
< |
t2.join(MEDIUM_DELAY_MS); |
533 |
< |
assertTrue(!t1.isAlive()); |
534 |
< |
assertTrue(!t2.isAlive()); |
520 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
521 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
522 |
|
} |
523 |
|
|
524 |
|
|
549 |
|
lock.writeLock().lock(); |
550 |
|
lock.writeLock().unlock(); |
551 |
|
lock.writeLock().unlock(); |
552 |
< |
t1.join(MEDIUM_DELAY_MS); |
553 |
< |
t2.join(MEDIUM_DELAY_MS); |
567 |
< |
assertTrue(!t1.isAlive()); |
568 |
< |
assertTrue(!t2.isAlive()); |
552 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
553 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
554 |
|
} |
555 |
|
|
556 |
|
|
566 |
|
lock.readLock().unlock(); |
567 |
|
}}); |
568 |
|
|
569 |
< |
t.join(); |
569 |
> |
awaitTermination(t, LONG_DELAY_MS); |
570 |
|
lock.readLock().unlock(); |
571 |
|
} |
572 |
|
|
581 |
|
assertFalse(lock.writeLock().tryLock()); |
582 |
|
}}); |
583 |
|
|
584 |
< |
t.join(); |
584 |
> |
awaitTermination(t, LONG_DELAY_MS); |
585 |
|
lock.readLock().unlock(); |
586 |
|
} |
587 |
|
|
598 |
|
lock.readLock().unlock(); |
599 |
|
}}); |
600 |
|
|
601 |
< |
t.join(); |
601 |
> |
awaitTermination(t, LONG_DELAY_MS); |
602 |
|
lock.readLock().unlock(); |
603 |
|
} |
604 |
|
|
615 |
|
assertFalse(lock.writeLock().tryLock()); |
616 |
|
}}); |
617 |
|
|
618 |
< |
t.join(); |
618 |
> |
awaitTermination(t, LONG_DELAY_MS); |
619 |
|
lock.readLock().unlock(); |
620 |
|
} |
621 |
|
|
632 |
|
assertFalse(lock.writeLock().tryLock(1, MILLISECONDS)); |
633 |
|
}}); |
634 |
|
|
635 |
< |
t.join(); |
635 |
> |
awaitTermination(t, LONG_DELAY_MS); |
636 |
|
assertTrue(lock.writeLock().isHeldByCurrentThread()); |
637 |
|
lock.writeLock().unlock(); |
638 |
|
} |
648 |
|
assertFalse(lock.readLock().tryLock(1, MILLISECONDS)); |
649 |
|
}}); |
650 |
|
|
651 |
< |
t.join(); |
651 |
> |
awaitTermination(t, LONG_DELAY_MS); |
652 |
|
assertTrue(lock.writeLock().isHeldByCurrentThread()); |
653 |
|
lock.writeLock().unlock(); |
654 |
|
} |
667 |
|
|
668 |
|
Thread.sleep(SHORT_DELAY_MS); |
669 |
|
t.interrupt(); |
670 |
< |
t.join(); |
671 |
< |
releaseLock(lock.writeLock()); |
670 |
> |
awaitTermination(t, LONG_DELAY_MS); |
671 |
> |
releaseWriteLock(lock); |
672 |
|
} |
673 |
|
|
674 |
|
/** |
684 |
|
|
685 |
|
Thread.sleep(SHORT_DELAY_MS); |
686 |
|
t.interrupt(); |
687 |
< |
t.join(); |
688 |
< |
releaseLock(lock.writeLock()); |
687 |
> |
awaitTermination(t, LONG_DELAY_MS); |
688 |
> |
releaseWriteLock(lock); |
689 |
|
} |
690 |
|
|
691 |
|
/** |
766 |
|
lock.writeLock().lock(); |
767 |
|
c.signal(); |
768 |
|
lock.writeLock().unlock(); |
769 |
< |
t.join(SHORT_DELAY_MS); |
785 |
< |
assertFalse(t.isAlive()); |
769 |
> |
awaitTermination(t, LONG_DELAY_MS); |
770 |
|
} |
771 |
|
|
772 |
|
/** A helper class for uninterruptible wait tests */ |
819 |
|
lock.writeLock().unlock(); |
820 |
|
} |
821 |
|
|
822 |
< |
thread.join(); |
822 |
> |
awaitTermination(thread, LONG_DELAY_MS); |
823 |
|
assertTrue(thread.interrupted); |
840 |
– |
assertFalse(thread.isAlive()); |
824 |
|
} |
825 |
|
|
826 |
|
/** |
920 |
|
lock.writeLock().lock(); |
921 |
|
c.signalAll(); |
922 |
|
lock.writeLock().unlock(); |
923 |
< |
t1.join(SHORT_DELAY_MS); |
924 |
< |
t2.join(SHORT_DELAY_MS); |
942 |
< |
assertFalse(t1.isAlive()); |
943 |
< |
assertFalse(t2.isAlive()); |
923 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
924 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
925 |
|
} |
926 |
|
|
927 |
|
/** |
965 |
|
lock.writeLock().unlock(); |
966 |
|
Thread.sleep(SHORT_DELAY_MS); |
967 |
|
assertFalse(lock.hasQueuedThreads()); |
968 |
< |
t1.join(); |
969 |
< |
t2.join(); |
968 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
969 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
970 |
|
} |
971 |
|
|
972 |
|
/** |
1006 |
|
assertFalse(sync.hasQueuedThread(t1)); |
1007 |
|
Thread.sleep(SHORT_DELAY_MS); |
1008 |
|
assertFalse(sync.hasQueuedThread(t2)); |
1009 |
< |
t1.join(); |
1010 |
< |
t2.join(); |
1009 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
1010 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
1011 |
|
} |
1012 |
|
|
1013 |
|
|
1032 |
|
lock.writeLock().unlock(); |
1033 |
|
Thread.sleep(SHORT_DELAY_MS); |
1034 |
|
assertEquals(0, lock.getQueueLength()); |
1035 |
< |
t1.join(); |
1036 |
< |
t2.join(); |
1035 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
1036 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
1037 |
|
} |
1038 |
|
|
1039 |
|
/** |
1060 |
|
lock.writeLock().unlock(); |
1061 |
|
Thread.sleep(SHORT_DELAY_MS); |
1062 |
|
assertTrue(lock.getQueuedThreads().isEmpty()); |
1063 |
< |
t1.join(); |
1064 |
< |
t2.join(); |
1063 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
1064 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
1065 |
|
} |
1066 |
|
|
1067 |
|
/** |
1202 |
|
assertFalse(lock.hasWaiters(c)); |
1203 |
|
assertEquals(0, lock.getWaitQueueLength(c)); |
1204 |
|
lock.writeLock().unlock(); |
1205 |
< |
t.join(SHORT_DELAY_MS); |
1225 |
< |
assertFalse(t.isAlive()); |
1205 |
> |
awaitTermination(t, LONG_DELAY_MS); |
1206 |
|
} |
1207 |
|
|
1208 |
|
/** |
1231 |
|
assertFalse(lock.hasWaiters(c)); |
1232 |
|
assertEquals(0, lock.getWaitQueueLength(c)); |
1233 |
|
lock.writeLock().unlock(); |
1234 |
< |
t.join(SHORT_DELAY_MS); |
1255 |
< |
assertFalse(t.isAlive()); |
1234 |
> |
awaitTermination(t, LONG_DELAY_MS); |
1235 |
|
} |
1236 |
|
|
1237 |
|
|
1275 |
|
assertFalse(lock.hasWaiters(c)); |
1276 |
|
assertTrue(lock.getWaitingThreads(c).isEmpty()); |
1277 |
|
lock.writeLock().unlock(); |
1278 |
< |
t1.join(SHORT_DELAY_MS); |
1279 |
< |
t2.join(SHORT_DELAY_MS); |
1301 |
< |
assertFalse(t1.isAlive()); |
1302 |
< |
assertFalse(t2.isAlive()); |
1278 |
> |
awaitTermination(t1, LONG_DELAY_MS); |
1279 |
> |
awaitTermination(t2, LONG_DELAY_MS); |
1280 |
|
} |
1281 |
|
|
1282 |
|
/** |