6 |
|
* Pat Fisher, Mike Judd. |
7 |
|
*/ |
8 |
|
|
9 |
– |
import junit.framework.*; |
10 |
– |
import java.util.concurrent.atomic.AtomicBoolean; |
11 |
– |
import java.util.concurrent.locks.*; |
12 |
– |
import java.util.concurrent.*; |
9 |
|
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
10 |
< |
import java.io.*; |
11 |
< |
import java.util.*; |
10 |
> |
|
11 |
> |
import java.util.Arrays; |
12 |
> |
import java.util.Collection; |
13 |
> |
import java.util.HashSet; |
14 |
> |
import java.util.concurrent.CountDownLatch; |
15 |
> |
import java.util.concurrent.atomic.AtomicBoolean; |
16 |
> |
import java.util.concurrent.locks.Condition; |
17 |
> |
import java.util.concurrent.locks.Lock; |
18 |
> |
import java.util.concurrent.locks.ReentrantReadWriteLock; |
19 |
> |
|
20 |
> |
import junit.framework.AssertionFailedError; |
21 |
> |
import junit.framework.Test; |
22 |
> |
import junit.framework.TestSuite; |
23 |
|
|
24 |
|
public class ReentrantReadWriteLockTest extends JSR166TestCase { |
25 |
|
public static void main(String[] args) { |
26 |
< |
junit.textui.TestRunner.run(suite()); |
26 |
> |
main(suite(), args); |
27 |
|
} |
28 |
|
public static Test suite() { |
29 |
|
return new TestSuite(ReentrantReadWriteLockTest.class); |
74 |
|
*/ |
75 |
|
void releaseWriteLock(PublicReentrantReadWriteLock lock) { |
76 |
|
ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock(); |
77 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
77 |
> |
assertWriteLockedByMoi(lock); |
78 |
|
assertEquals(1, lock.getWriteHoldCount()); |
79 |
|
writeLock.unlock(); |
80 |
|
assertNotWriteLocked(lock); |
87 |
|
long startTime = System.nanoTime(); |
88 |
|
while (!lock.hasQueuedThread(t)) { |
89 |
|
if (millisElapsedSince(startTime) > LONG_DELAY_MS) |
90 |
< |
throw new AssertionError("timed out"); |
90 |
> |
throw new AssertionFailedError("timed out"); |
91 |
|
Thread.yield(); |
92 |
|
} |
93 |
|
assertTrue(t.isAlive()); |
94 |
< |
assertTrue(lock.getOwner() != t); |
94 |
> |
assertNotSame(t, lock.getOwner()); |
95 |
|
} |
96 |
|
|
97 |
|
/** |
101 |
|
assertFalse(lock.isWriteLocked()); |
102 |
|
assertFalse(lock.isWriteLockedByCurrentThread()); |
103 |
|
assertFalse(lock.writeLock().isHeldByCurrentThread()); |
97 |
– |
assertNull(lock.getOwner()); |
104 |
|
assertEquals(0, lock.getWriteHoldCount()); |
105 |
+ |
assertEquals(0, lock.writeLock().getHoldCount()); |
106 |
+ |
assertNull(lock.getOwner()); |
107 |
|
} |
108 |
|
|
109 |
|
/** |
118 |
|
lock.writeLock().isHeldByCurrentThread()); |
119 |
|
assertEquals(t == Thread.currentThread(), |
120 |
|
lock.getWriteHoldCount() > 0); |
121 |
+ |
assertEquals(t == Thread.currentThread(), |
122 |
+ |
lock.writeLock().getHoldCount() > 0); |
123 |
|
assertEquals(0, lock.getReadLockCount()); |
124 |
|
} |
125 |
|
|
126 |
|
/** |
127 |
+ |
* Checks that lock is write-locked by the current thread. |
128 |
+ |
*/ |
129 |
+ |
void assertWriteLockedByMoi(PublicReentrantReadWriteLock lock) { |
130 |
+ |
assertWriteLockedBy(lock, Thread.currentThread()); |
131 |
+ |
} |
132 |
+ |
|
133 |
+ |
/** |
134 |
|
* Checks that condition c has no waiters. |
135 |
|
*/ |
136 |
|
void assertHasNoWaiters(PublicReentrantReadWriteLock lock, Condition c) { |
152 |
|
lock.writeLock().unlock(); |
153 |
|
} |
154 |
|
|
155 |
< |
enum AwaitMethod { await, awaitNanos, awaitUntil }; |
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(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(); |
155 |
< |
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(); |
181 |
|
} |
182 |
|
} |
183 |
|
|
213 |
|
new PublicReentrantReadWriteLock(fair); |
214 |
|
assertNotWriteLocked(lock); |
215 |
|
lock.writeLock().lock(); |
216 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
216 |
> |
assertWriteLockedByMoi(lock); |
217 |
|
lock.writeLock().unlock(); |
218 |
|
assertNotWriteLocked(lock); |
219 |
|
assertEquals(0, lock.getReadLockCount()); |
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 |
|
|
383 |
|
} |
384 |
|
|
385 |
|
/** |
386 |
+ |
* write-tryLock on an unlocked lock succeeds |
387 |
+ |
*/ |
388 |
+ |
public void testWriteTryLock() { testWriteTryLock(false); } |
389 |
+ |
public void testWriteTryLock_fair() { testWriteTryLock(true); } |
390 |
+ |
public void testWriteTryLock(boolean fair) { |
391 |
+ |
final PublicReentrantReadWriteLock lock = |
392 |
+ |
new PublicReentrantReadWriteLock(fair); |
393 |
+ |
assertTrue(lock.writeLock().tryLock()); |
394 |
+ |
assertWriteLockedByMoi(lock); |
395 |
+ |
assertTrue(lock.writeLock().tryLock()); |
396 |
+ |
assertWriteLockedByMoi(lock); |
397 |
+ |
lock.writeLock().unlock(); |
398 |
+ |
releaseWriteLock(lock); |
399 |
+ |
} |
400 |
+ |
|
401 |
+ |
/** |
402 |
|
* write-tryLock fails if locked |
403 |
|
*/ |
404 |
|
public void testWriteTryLockWhenLocked() { testWriteTryLockWhenLocked(false); } |
518 |
|
|
519 |
|
/** |
520 |
|
* A thread that tries to acquire a fair read lock (non-reentrantly) |
521 |
< |
* will block if there is a waiting writer thread. |
521 |
> |
* will block if there is a waiting writer thread |
522 |
|
*/ |
523 |
|
public void testReaderWriterReaderFairFifo() { |
524 |
|
final PublicReentrantReadWriteLock lock = |
595 |
|
} |
596 |
|
|
597 |
|
/** |
598 |
< |
* Read trylock succeeds (barging) even in the presence of waiting readers and/or writers. |
598 |
> |
* Read trylock succeeds (barging) even in the presence of waiting |
599 |
> |
* readers and/or writers |
600 |
|
*/ |
601 |
|
public void testReadTryLockBarging() { testReadTryLockBarging(false); } |
602 |
|
public void testReadTryLockBarging_fair() { testReadTryLockBarging(true); } |
663 |
|
|
664 |
|
waitForQueuedThread(lock, t1); |
665 |
|
waitForQueuedThread(lock, t2); |
666 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
666 |
> |
assertWriteLockedByMoi(lock); |
667 |
|
lock.readLock().lock(); |
668 |
|
lock.readLock().unlock(); |
669 |
|
releaseWriteLock(lock); |
697 |
|
|
698 |
|
waitForQueuedThread(lock, t1); |
699 |
|
waitForQueuedThread(lock, t2); |
700 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
700 |
> |
assertWriteLockedByMoi(lock); |
701 |
|
lock.readLock().lock(); |
702 |
|
lock.readLock().unlock(); |
703 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
703 |
> |
assertWriteLockedByMoi(lock); |
704 |
|
lock.writeLock().unlock(); |
705 |
|
awaitTermination(t1); |
706 |
|
awaitTermination(t2); |
732 |
|
|
733 |
|
waitForQueuedThread(lock, t1); |
734 |
|
waitForQueuedThread(lock, t2); |
735 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
735 |
> |
assertWriteLockedByMoi(lock); |
736 |
|
assertEquals(1, lock.getWriteHoldCount()); |
737 |
|
lock.writeLock().lock(); |
738 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
738 |
> |
assertWriteLockedByMoi(lock); |
739 |
|
assertEquals(2, lock.getWriteHoldCount()); |
740 |
|
lock.writeLock().unlock(); |
741 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
741 |
> |
assertWriteLockedByMoi(lock); |
742 |
|
assertEquals(1, lock.getWriteHoldCount()); |
743 |
|
lock.writeLock().unlock(); |
744 |
|
awaitTermination(t1); |
786 |
|
public void testWriteTryLock_Timeout() { testWriteTryLock_Timeout(false); } |
787 |
|
public void testWriteTryLock_Timeout_fair() { testWriteTryLock_Timeout(true); } |
788 |
|
public void testWriteTryLock_Timeout(boolean fair) { |
789 |
< |
final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair); |
789 |
> |
final PublicReentrantReadWriteLock lock = |
790 |
> |
new PublicReentrantReadWriteLock(fair); |
791 |
|
lock.writeLock().lock(); |
792 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
793 |
|
public void realRun() throws InterruptedException { |
798 |
|
}}); |
799 |
|
|
800 |
|
awaitTermination(t); |
801 |
< |
assertTrue(lock.writeLock().isHeldByCurrentThread()); |
760 |
< |
lock.writeLock().unlock(); |
801 |
> |
releaseWriteLock(lock); |
802 |
|
} |
803 |
|
|
804 |
|
/** |
823 |
|
} |
824 |
|
|
825 |
|
/** |
826 |
< |
* write lockInterruptibly succeeds if lock free else is interruptible |
826 |
> |
* write lockInterruptibly succeeds if unlocked, else is interruptible |
827 |
|
*/ |
828 |
|
public void testWriteLockInterruptibly() { testWriteLockInterruptibly(false); } |
829 |
|
public void testWriteLockInterruptibly_fair() { testWriteLockInterruptibly(true); } |
832 |
|
new PublicReentrantReadWriteLock(fair); |
833 |
|
try { |
834 |
|
lock.writeLock().lockInterruptibly(); |
835 |
< |
} catch (Throwable t) { |
795 |
< |
threadUnexpectedException(t); |
796 |
< |
} |
835 |
> |
} catch (InterruptedException fail) { threadUnexpectedException(fail); } |
836 |
|
Thread t = newStartedThread(new CheckedInterruptedRunnable() { |
837 |
|
public void realRun() throws InterruptedException { |
838 |
|
lock.writeLock().lockInterruptibly(); |
840 |
|
|
841 |
|
waitForQueuedThread(lock, t); |
842 |
|
t.interrupt(); |
843 |
+ |
assertTrue(lock.writeLock().isHeldByCurrentThread()); |
844 |
|
awaitTermination(t); |
845 |
|
releaseWriteLock(lock); |
846 |
|
} |
857 |
|
lock.readLock().lockInterruptibly(); |
858 |
|
lock.readLock().unlock(); |
859 |
|
lock.writeLock().lockInterruptibly(); |
860 |
< |
} catch (Throwable t) { |
821 |
< |
threadUnexpectedException(t); |
822 |
< |
} |
860 |
> |
} catch (InterruptedException fail) { threadUnexpectedException(fail); } |
861 |
|
Thread t = newStartedThread(new CheckedInterruptedRunnable() { |
862 |
|
public void realRun() throws InterruptedException { |
863 |
|
lock.readLock().lockInterruptibly(); |
877 |
|
public void testAwait_IMSE(boolean fair) { |
878 |
|
final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair); |
879 |
|
final Condition c = lock.writeLock().newCondition(); |
880 |
< |
long startTime = System.nanoTime(); |
881 |
< |
try { |
844 |
< |
try { |
845 |
< |
c.await(); |
846 |
< |
shouldThrow(); |
847 |
< |
} catch (IllegalMonitorStateException success) {} |
848 |
< |
try { |
849 |
< |
c.await(LONG_DELAY_MS, MILLISECONDS); |
850 |
< |
shouldThrow(); |
851 |
< |
} catch (IllegalMonitorStateException success) {} |
852 |
< |
try { |
853 |
< |
c.awaitNanos(MILLISECONDS.toNanos(LONG_DELAY_MS)); |
854 |
< |
shouldThrow(); |
855 |
< |
} catch (IllegalMonitorStateException success) {} |
880 |
> |
for (AwaitMethod awaitMethod : AwaitMethod.values()) { |
881 |
> |
long startTime = System.nanoTime(); |
882 |
|
try { |
883 |
< |
c.awaitUninterruptibly(); |
883 |
> |
await(c, awaitMethod); |
884 |
|
shouldThrow(); |
885 |
< |
} catch (IllegalMonitorStateException success) {} |
886 |
< |
} catch (Throwable t) { |
887 |
< |
threadUnexpectedException(t); |
885 |
> |
} catch (IllegalMonitorStateException success) { |
886 |
> |
} catch (InterruptedException fail) { |
887 |
> |
threadUnexpectedException(fail); |
888 |
> |
} |
889 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
890 |
|
} |
863 |
– |
assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS); |
891 |
|
} |
892 |
|
|
893 |
|
/** |
936 |
|
assertTrue(nanosRemaining <= 0); |
937 |
|
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
938 |
|
lock.writeLock().unlock(); |
939 |
< |
} catch (InterruptedException e) { |
913 |
< |
threadUnexpectedException(e); |
914 |
< |
} |
939 |
> |
} catch (InterruptedException fail) { threadUnexpectedException(fail); } |
940 |
|
} |
941 |
|
|
942 |
|
/** |
955 |
|
assertFalse(c.await(timeoutMillis, MILLISECONDS)); |
956 |
|
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
957 |
|
lock.writeLock().unlock(); |
958 |
< |
} catch (InterruptedException e) { |
934 |
< |
threadUnexpectedException(e); |
935 |
< |
} |
958 |
> |
} catch (InterruptedException fail) { threadUnexpectedException(fail); } |
959 |
|
} |
960 |
|
|
961 |
|
/** |
975 |
|
assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis))); |
976 |
|
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
977 |
|
lock.writeLock().unlock(); |
978 |
< |
} catch (InterruptedException e) { |
956 |
< |
threadUnexpectedException(e); |
957 |
< |
} |
978 |
> |
} catch (InterruptedException fail) { threadUnexpectedException(fail); } |
979 |
|
} |
980 |
|
|
981 |
|
/** |
1007 |
|
} |
1008 |
|
|
1009 |
|
/** |
1010 |
< |
* awaitUninterruptibly doesn't abort on interrupt |
1010 |
> |
* awaitUninterruptibly is uninterruptible |
1011 |
|
*/ |
1012 |
|
public void testAwaitUninterruptibly() { testAwaitUninterruptibly(false); } |
1013 |
|
public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); } |
1014 |
|
public void testAwaitUninterruptibly(boolean fair) { |
1015 |
|
final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair); |
1016 |
|
final Condition c = lock.writeLock().newCondition(); |
1017 |
< |
final CountDownLatch locked = new CountDownLatch(1); |
1018 |
< |
Thread t = newStartedThread(new CheckedRunnable() { |
1017 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(2); |
1018 |
> |
|
1019 |
> |
Thread t1 = newStartedThread(new CheckedRunnable() { |
1020 |
|
public void realRun() { |
1021 |
+ |
// Interrupt before awaitUninterruptibly |
1022 |
|
lock.writeLock().lock(); |
1023 |
< |
locked.countDown(); |
1023 |
> |
pleaseInterrupt.countDown(); |
1024 |
> |
Thread.currentThread().interrupt(); |
1025 |
|
c.awaitUninterruptibly(); |
1026 |
|
assertTrue(Thread.interrupted()); |
1027 |
|
lock.writeLock().unlock(); |
1028 |
|
}}); |
1029 |
|
|
1030 |
< |
await(locked); |
1030 |
> |
Thread t2 = newStartedThread(new CheckedRunnable() { |
1031 |
> |
public void realRun() { |
1032 |
> |
// Interrupt during awaitUninterruptibly |
1033 |
> |
lock.writeLock().lock(); |
1034 |
> |
pleaseInterrupt.countDown(); |
1035 |
> |
c.awaitUninterruptibly(); |
1036 |
> |
assertTrue(Thread.interrupted()); |
1037 |
> |
lock.writeLock().unlock(); |
1038 |
> |
}}); |
1039 |
> |
|
1040 |
> |
await(pleaseInterrupt); |
1041 |
|
lock.writeLock().lock(); |
1042 |
|
lock.writeLock().unlock(); |
1043 |
< |
t.interrupt(); |
1044 |
< |
long timeoutMillis = 10; |
1045 |
< |
assertThreadJoinTimesOut(t, timeoutMillis); |
1043 |
> |
t2.interrupt(); |
1044 |
> |
|
1045 |
> |
assertThreadStaysAlive(t1); |
1046 |
> |
assertTrue(t2.isAlive()); |
1047 |
> |
|
1048 |
|
lock.writeLock().lock(); |
1049 |
< |
c.signal(); |
1049 |
> |
c.signalAll(); |
1050 |
|
lock.writeLock().unlock(); |
1051 |
< |
awaitTermination(t); |
1051 |
> |
|
1052 |
> |
awaitTermination(t1); |
1053 |
> |
awaitTermination(t2); |
1054 |
|
} |
1055 |
|
|
1056 |
|
/** |
1058 |
|
*/ |
1059 |
|
public void testInterruptible_await() { testInterruptible(false, AwaitMethod.await); } |
1060 |
|
public void testInterruptible_await_fair() { testInterruptible(true, AwaitMethod.await); } |
1061 |
+ |
public void testInterruptible_awaitTimed() { testInterruptible(false, AwaitMethod.awaitTimed); } |
1062 |
+ |
public void testInterruptible_awaitTimed_fair() { testInterruptible(true, AwaitMethod.awaitTimed); } |
1063 |
|
public void testInterruptible_awaitNanos() { testInterruptible(false, AwaitMethod.awaitNanos); } |
1064 |
|
public void testInterruptible_awaitNanos_fair() { testInterruptible(true, AwaitMethod.awaitNanos); } |
1065 |
|
public void testInterruptible_awaitUntil() { testInterruptible(false, AwaitMethod.awaitUntil); } |
1072 |
|
Thread t = newStartedThread(new CheckedInterruptedRunnable() { |
1073 |
|
public void realRun() throws InterruptedException { |
1074 |
|
lock.writeLock().lock(); |
1075 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
1075 |
> |
assertWriteLockedByMoi(lock); |
1076 |
|
assertHasNoWaiters(lock, c); |
1077 |
|
locked.countDown(); |
1078 |
|
try { |
1079 |
|
await(c, awaitMethod); |
1080 |
|
} finally { |
1081 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
1081 |
> |
assertWriteLockedByMoi(lock); |
1082 |
|
assertHasNoWaiters(lock, c); |
1083 |
|
lock.writeLock().unlock(); |
1084 |
|
assertFalse(Thread.interrupted()); |
1097 |
|
*/ |
1098 |
|
public void testSignalAll_await() { testSignalAll(false, AwaitMethod.await); } |
1099 |
|
public void testSignalAll_await_fair() { testSignalAll(true, AwaitMethod.await); } |
1100 |
+ |
public void testSignalAll_awaitTimed() { testSignalAll(false, AwaitMethod.awaitTimed); } |
1101 |
+ |
public void testSignalAll_awaitTimed_fair() { testSignalAll(true, AwaitMethod.awaitTimed); } |
1102 |
|
public void testSignalAll_awaitNanos() { testSignalAll(false, AwaitMethod.awaitNanos); } |
1103 |
|
public void testSignalAll_awaitNanos_fair() { testSignalAll(true, AwaitMethod.awaitNanos); } |
1104 |
|
public void testSignalAll_awaitUntil() { testSignalAll(false, AwaitMethod.awaitUntil); } |
1132 |
|
} |
1133 |
|
|
1134 |
|
/** |
1135 |
< |
* signal wakes up waiting threads in FIFO order. |
1135 |
> |
* signal wakes up waiting threads in FIFO order |
1136 |
|
*/ |
1137 |
|
public void testSignalWakesFifo() { testSignalWakesFifo(false); } |
1138 |
|
public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); } |
1192 |
|
Thread t1 = newStartedThread(new CheckedRunnable() { |
1193 |
|
public void realRun() throws InterruptedException { |
1194 |
|
lock.writeLock().lock(); |
1195 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
1195 |
> |
assertWriteLockedByMoi(lock); |
1196 |
|
assertEquals(1, lock.writeLock().getHoldCount()); |
1197 |
|
locked.countDown(); |
1198 |
|
c.await(); |
1199 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
1199 |
> |
assertWriteLockedByMoi(lock); |
1200 |
|
assertEquals(1, lock.writeLock().getHoldCount()); |
1201 |
|
lock.writeLock().unlock(); |
1202 |
|
}}); |
1205 |
|
public void realRun() throws InterruptedException { |
1206 |
|
lock.writeLock().lock(); |
1207 |
|
lock.writeLock().lock(); |
1208 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
1208 |
> |
assertWriteLockedByMoi(lock); |
1209 |
|
assertEquals(2, lock.writeLock().getHoldCount()); |
1210 |
|
locked.countDown(); |
1211 |
|
c.await(); |
1212 |
< |
assertWriteLockedBy(lock, Thread.currentThread()); |
1212 |
> |
assertWriteLockedByMoi(lock); |
1213 |
|
assertEquals(2, lock.writeLock().getHoldCount()); |
1214 |
|
lock.writeLock().unlock(); |
1215 |
|
lock.writeLock().unlock(); |
1247 |
|
assertEquals(1, clone.getReadLockCount()); |
1248 |
|
clone.readLock().unlock(); |
1249 |
|
clone.writeLock().unlock(); |
1250 |
+ |
assertFalse(clone.isWriteLocked()); |
1251 |
+ |
assertEquals(1, lock.getReadLockCount()); |
1252 |
+ |
assertEquals(0, clone.getReadLockCount()); |
1253 |
|
} |
1254 |
|
|
1255 |
|
/** |
1293 |
|
} |
1294 |
|
|
1295 |
|
/** |
1296 |
< |
* hasQueuedThread reports whether a thread is queued. |
1296 |
> |
* hasQueuedThread reports whether a thread is queued |
1297 |
|
*/ |
1298 |
|
public void testHasQueuedThread() { testHasQueuedThread(false); } |
1299 |
|
public void testHasQueuedThread_fair() { testHasQueuedThread(true); } |
1634 |
|
public void testToString_fair() { testToString(true); } |
1635 |
|
public void testToString(boolean fair) { |
1636 |
|
ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair); |
1637 |
< |
String us = lock.toString(); |
1638 |
< |
assertTrue(us.indexOf("Write locks = 0") >= 0); |
1639 |
< |
assertTrue(us.indexOf("Read locks = 0") >= 0); |
1640 |
< |
lock.writeLock().lock(); |
1641 |
< |
String ws = lock.toString(); |
1597 |
< |
assertTrue(ws.indexOf("Write locks = 1") >= 0); |
1598 |
< |
assertTrue(ws.indexOf("Read locks = 0") >= 0); |
1637 |
> |
assertTrue(lock.toString().contains("Write locks = 0")); |
1638 |
> |
assertTrue(lock.toString().contains("Read locks = 0")); |
1639 |
> |
lock.writeLock().lock(); |
1640 |
> |
assertTrue(lock.toString().contains("Write locks = 1")); |
1641 |
> |
assertTrue(lock.toString().contains("Read locks = 0")); |
1642 |
|
lock.writeLock().unlock(); |
1643 |
|
lock.readLock().lock(); |
1644 |
|
lock.readLock().lock(); |
1645 |
< |
String rs = lock.toString(); |
1646 |
< |
assertTrue(rs.indexOf("Write locks = 0") >= 0); |
1604 |
< |
assertTrue(rs.indexOf("Read locks = 2") >= 0); |
1645 |
> |
assertTrue(lock.toString().contains("Write locks = 0")); |
1646 |
> |
assertTrue(lock.toString().contains("Read locks = 2")); |
1647 |
|
} |
1648 |
|
|
1649 |
|
/** |
1653 |
|
public void testReadLockToString_fair() { testReadLockToString(true); } |
1654 |
|
public void testReadLockToString(boolean fair) { |
1655 |
|
ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair); |
1656 |
< |
String us = lock.readLock().toString(); |
1615 |
< |
assertTrue(us.indexOf("Read locks = 0") >= 0); |
1656 |
> |
assertTrue(lock.readLock().toString().contains("Read locks = 0")); |
1657 |
|
lock.readLock().lock(); |
1658 |
|
lock.readLock().lock(); |
1659 |
< |
String rs = lock.readLock().toString(); |
1619 |
< |
assertTrue(rs.indexOf("Read locks = 2") >= 0); |
1659 |
> |
assertTrue(lock.readLock().toString().contains("Read locks = 2")); |
1660 |
|
} |
1661 |
|
|
1662 |
|
/** |
1666 |
|
public void testWriteLockToString_fair() { testWriteLockToString(true); } |
1667 |
|
public void testWriteLockToString(boolean fair) { |
1668 |
|
ReentrantReadWriteLock lock = new ReentrantReadWriteLock(fair); |
1669 |
< |
String us = lock.writeLock().toString(); |
1630 |
< |
assertTrue(us.indexOf("Unlocked") >= 0); |
1669 |
> |
assertTrue(lock.writeLock().toString().contains("Unlocked")); |
1670 |
|
lock.writeLock().lock(); |
1671 |
< |
String ls = lock.writeLock().toString(); |
1672 |
< |
assertTrue(ls.indexOf("Locked") >= 0); |
1671 |
> |
assertTrue(lock.writeLock().toString().contains("Locked")); |
1672 |
> |
lock.writeLock().unlock(); |
1673 |
> |
assertTrue(lock.writeLock().toString().contains("Unlocked")); |
1674 |
|
} |
1675 |
|
|
1676 |
|
} |