248 |
|
long s = assertNonZero(lock.writeLock()); |
249 |
|
assertTrue(lock.validate(s)); |
250 |
|
assertFalse(lock.validate(lock.tryWriteLock())); |
251 |
< |
assertFalse(lock.validate(lock.tryWriteLock(0L, SECONDS))); |
251 |
> |
assertFalse(lock.validate(lock.tryWriteLock(randomExpiredTimeout(), |
252 |
> |
randomTimeUnit()))); |
253 |
|
assertFalse(lock.validate(lock.tryReadLock())); |
254 |
< |
assertFalse(lock.validate(lock.tryReadLock(0L, SECONDS))); |
254 |
> |
assertFalse(lock.validate(lock.tryWriteLock(randomExpiredTimeout(), |
255 |
> |
randomTimeUnit()))); |
256 |
|
assertFalse(lock.validate(lock.tryOptimisticRead())); |
257 |
|
lock.unlockWrite(s); |
258 |
|
} |
478 |
|
} |
479 |
|
|
480 |
|
/** |
481 |
< |
* A writelock succeeds only after a reading thread unlocks |
481 |
> |
* writeLock() succeeds only after a reading thread unlocks |
482 |
|
*/ |
483 |
|
public void testWriteAfterReadLock() throws InterruptedException { |
484 |
< |
final CountDownLatch threadStarted = new CountDownLatch(1); |
484 |
> |
final CountDownLatch aboutToLock = new CountDownLatch(1); |
485 |
|
final StampedLock lock = new StampedLock(); |
486 |
|
long rs = lock.readLock(); |
487 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
488 |
|
public void realRun() { |
489 |
< |
threadStarted.countDown(); |
489 |
> |
aboutToLock.countDown(); |
490 |
|
long s = lock.writeLock(); |
491 |
+ |
assertTrue(lock.isWriteLocked()); |
492 |
+ |
assertFalse(lock.isReadLocked()); |
493 |
|
lock.unlockWrite(s); |
494 |
|
}}); |
495 |
|
|
496 |
< |
threadStarted.await(); |
497 |
< |
waitForThreadToEnterWaitState(t, MEDIUM_DELAY_MS); |
496 |
> |
await(aboutToLock); |
497 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
498 |
|
assertFalse(lock.isWriteLocked()); |
499 |
+ |
assertTrue(lock.isReadLocked()); |
500 |
|
lock.unlockRead(rs); |
501 |
|
awaitTermination(t); |
502 |
< |
assertFalse(lock.isWriteLocked()); |
502 |
> |
assertUnlocked(lock); |
503 |
|
} |
504 |
|
|
505 |
|
/** |
506 |
< |
* A writelock succeeds only after reading threads unlock |
506 |
> |
* writeLock() succeeds only after reading threads unlock |
507 |
|
*/ |
508 |
|
public void testWriteAfterMultipleReadLocks() { |
509 |
|
final StampedLock lock = new StampedLock(); |
526 |
|
assertFalse(lock.isWriteLocked()); |
527 |
|
lock.unlockRead(s); |
528 |
|
awaitTermination(t2); |
529 |
< |
assertFalse(lock.isWriteLocked()); |
529 |
> |
assertUnlocked(lock); |
530 |
|
} |
531 |
|
|
532 |
|
/** |
533 |
< |
* Readlocks succeed only after a writing thread unlocks |
533 |
> |
* readLock() succeed only after a writing thread unlocks |
534 |
|
*/ |
535 |
|
public void testReadAfterWriteLock() { |
536 |
|
final StampedLock lock = new StampedLock(); |
537 |
|
final CountDownLatch threadsStarted = new CountDownLatch(2); |
538 |
|
final long s = lock.writeLock(); |
539 |
< |
Thread t1 = newStartedThread(new CheckedRunnable() { |
539 |
> |
final Runnable acquireReleaseReadLock = new CheckedRunnable() { |
540 |
|
public void realRun() { |
541 |
|
threadsStarted.countDown(); |
542 |
|
long rs = lock.readLock(); |
543 |
+ |
assertTrue(lock.isReadLocked()); |
544 |
+ |
assertFalse(lock.isWriteLocked()); |
545 |
|
lock.unlockRead(rs); |
546 |
< |
}}); |
547 |
< |
Thread t2 = newStartedThread(new CheckedRunnable() { |
548 |
< |
public void realRun() { |
542 |
< |
threadsStarted.countDown(); |
543 |
< |
long rs = lock.readLock(); |
544 |
< |
lock.unlockRead(rs); |
545 |
< |
}}); |
546 |
> |
}}; |
547 |
> |
Thread t1 = newStartedThread(acquireReleaseReadLock); |
548 |
> |
Thread t2 = newStartedThread(acquireReleaseReadLock); |
549 |
|
|
550 |
|
await(threadsStarted); |
551 |
< |
waitForThreadToEnterWaitState(t1, MEDIUM_DELAY_MS); |
552 |
< |
waitForThreadToEnterWaitState(t2, MEDIUM_DELAY_MS); |
551 |
> |
assertThreadBlocks(t1, Thread.State.WAITING); |
552 |
> |
assertThreadBlocks(t2, Thread.State.WAITING); |
553 |
> |
assertTrue(lock.isWriteLocked()); |
554 |
> |
assertFalse(lock.isReadLocked()); |
555 |
|
releaseWriteLock(lock, s); |
556 |
|
awaitTermination(t1); |
557 |
|
awaitTermination(t2); |
558 |
+ |
assertUnlocked(lock); |
559 |
|
} |
560 |
|
|
561 |
|
/** |
752 |
|
lock.writeLockInterruptibly(); |
753 |
|
}}); |
754 |
|
|
755 |
< |
locked.await(); |
755 |
> |
await(locked); |
756 |
|
assertFalse(lock.validate(p)); |
757 |
|
assertEquals(0L, lock.tryOptimisticRead()); |
758 |
+ |
assertThreadBlocks(t, Thread.State.WAITING); |
759 |
|
t.interrupt(); |
760 |
|
awaitTermination(t); |
761 |
+ |
assertTrue(lock.isWriteLocked()); |
762 |
|
} |
763 |
|
|
764 |
|
/** |