--- jsr166/src/test/tck/ReentrantReadWriteLockTest.java 2003/12/28 21:56:18 1.13 +++ jsr166/src/test/tck/ReentrantReadWriteLockTest.java 2005/05/03 16:02:00 1.22 @@ -156,16 +156,18 @@ public class ReentrantReadWriteLockTest */ public void testWriteLockInterruptibly_Interrupted() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); - lock.writeLock().lock(); Thread t = new Thread(new Runnable() { public void run() { try { lock.writeLock().lockInterruptibly(); - threadShouldThrow(); + lock.writeLock().unlock(); + lock.writeLock().lockInterruptibly(); + lock.writeLock().unlock(); } catch(InterruptedException success){} } }); try { + lock.writeLock().lock(); t.start(); t.interrupt(); lock.writeLock().unlock(); @@ -176,7 +178,7 @@ public class ReentrantReadWriteLockTest } /** - * timed write-trylock is interruptible + * timed write-tryLock is interruptible */ public void testWriteTryLock_Interrupted() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -185,7 +187,6 @@ public class ReentrantReadWriteLockTest public void run() { try { lock.writeLock().tryLock(1000,TimeUnit.MILLISECONDS); - threadShouldThrow(); } catch(InterruptedException success){} } }); @@ -209,7 +210,6 @@ public class ReentrantReadWriteLockTest public void run() { try { lock.readLock().lockInterruptibly(); - threadShouldThrow(); } catch(InterruptedException success){} } }); @@ -224,7 +224,7 @@ public class ReentrantReadWriteLockTest } /** - * timed read-trylock is interruptible + * timed read-tryLock is interruptible */ public void testReadTryLock_Interrupted() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -248,7 +248,7 @@ public class ReentrantReadWriteLockTest /** - * write-trylock fails if locked + * write-tryLock fails if locked */ public void testWriteTryLockWhenLocked() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -268,7 +268,7 @@ public class ReentrantReadWriteLockTest } /** - * read-trylock fails if locked + * read-tryLock fails if locked */ public void testReadTryLockWhenLocked() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -376,9 +376,109 @@ public class ReentrantReadWriteLockTest } } + /** + * Read trylock succeeds if write locked by current thread + */ + public void testReadHoldingWriteLock() { + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + lock.writeLock().lock(); + assertTrue(lock.readLock().tryLock()); + lock.readLock().unlock(); + lock.writeLock().unlock(); + } + + /** + * Read lock succeeds if write locked by current thread even if + * other threads are waiting + */ + public void testReadHoldingWriteLock2() { + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + lock.writeLock().lock(); + Thread t1 = new Thread(new Runnable() { + public void run() { + lock.readLock().lock(); + lock.readLock().unlock(); + } + }); + Thread t2 = new Thread(new Runnable() { + public void run() { + lock.readLock().lock(); + lock.readLock().unlock(); + } + }); + + try { + t1.start(); + t2.start(); + lock.readLock().lock(); + lock.readLock().unlock(); + Thread.sleep(SHORT_DELAY_MS); + lock.readLock().lock(); + lock.readLock().unlock(); + lock.writeLock().unlock(); + t1.join(MEDIUM_DELAY_MS); + t2.join(MEDIUM_DELAY_MS); + assertTrue(!t1.isAlive()); + assertTrue(!t2.isAlive()); + + } catch(Exception e){ + unexpectedException(); + } + } + + /** + * Fair Read trylock succeeds if write locked by current thread + */ + public void testReadHoldingWriteLockFair() { + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true); + lock.writeLock().lock(); + assertTrue(lock.readLock().tryLock()); + lock.readLock().unlock(); + lock.writeLock().unlock(); + } + + /** + * Fair Read lock succeeds if write locked by current thread even if + * other threads are waiting + */ + public void testReadHoldingWriteLockFair2() { + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true); + lock.writeLock().lock(); + Thread t1 = new Thread(new Runnable() { + public void run() { + lock.readLock().lock(); + lock.readLock().unlock(); + } + }); + Thread t2 = new Thread(new Runnable() { + public void run() { + lock.readLock().lock(); + lock.readLock().unlock(); + } + }); + + try { + t1.start(); + t2.start(); + lock.readLock().lock(); + lock.readLock().unlock(); + Thread.sleep(SHORT_DELAY_MS); + lock.readLock().lock(); + lock.readLock().unlock(); + lock.writeLock().unlock(); + t1.join(MEDIUM_DELAY_MS); + t2.join(MEDIUM_DELAY_MS); + assertTrue(!t1.isAlive()); + assertTrue(!t2.isAlive()); + + } catch(Exception e){ + unexpectedException(); + } + } + /** - * Read trylock succeeds if readlocked but not writelocked + * Read tryLock succeeds if readlocked but not writelocked */ public void testTryLockWhenReadLocked() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -401,7 +501,7 @@ public class ReentrantReadWriteLockTest /** - * write trylock fails when readlocked + * write tryLock fails when readlocked */ public void testWriteTryLockWhenReadLocked() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -423,7 +523,7 @@ public class ReentrantReadWriteLockTest /** - * write timed trylock times out if locked + * write timed tryLock times out if locked */ public void testWriteTryLock_Timeout() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -447,7 +547,7 @@ public class ReentrantReadWriteLockTest } /** - * read timed trylock times out if write-locked + * read timed tryLock times out if write-locked */ public void testReadTryLock_Timeout() { final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); @@ -591,7 +691,6 @@ public class ReentrantReadWriteLockTest final Condition c = lock.writeLock().newCondition(); try { lock.writeLock().lock(); - assertFalse(c.await(10, TimeUnit.MILLISECONDS)); lock.writeLock().unlock(); } catch (Exception ex) { @@ -608,7 +707,6 @@ public class ReentrantReadWriteLockTest try { lock.writeLock().lock(); java.util.Date d = new java.util.Date(); - assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10))); lock.writeLock().unlock(); } catch (Exception ex) { @@ -649,32 +747,61 @@ public class ReentrantReadWriteLockTest } } + /** A helper class for uninterruptible wait tests */ + class UninterruptableThread extends Thread { + private Lock lock; + private Condition c; + + public volatile boolean canAwake = false; + public volatile boolean interrupted = false; + public volatile boolean lockStarted = false; + + public UninterruptableThread(Lock lock, Condition c) { + this.lock = lock; + this.c = c; + } + + public synchronized void run() { + lock.lock(); + lockStarted = true; + + while (!canAwake) { + c.awaitUninterruptibly(); + } + + interrupted = isInterrupted(); + lock.unlock(); + } + } + /** * awaitUninterruptibly doesn't abort on interrupt */ public void testAwaitUninterruptibly() { - final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); final Condition c = lock.writeLock().newCondition(); - Thread t = new Thread(new Runnable() { - public void run() { - lock.writeLock().lock(); - c.awaitUninterruptibly(); - lock.writeLock().unlock(); - } - }); + UninterruptableThread thread = new UninterruptableThread(lock.writeLock(), c); try { - t.start(); - Thread.sleep(SHORT_DELAY_MS); - t.interrupt(); + thread.start(); + + while (!thread.lockStarted) { + Thread.sleep(100); + } + lock.writeLock().lock(); - c.signal(); - lock.writeLock().unlock(); - assert(t.isInterrupted()); - t.join(SHORT_DELAY_MS); - assertFalse(t.isAlive()); - } - catch (Exception ex) { + try { + thread.interrupt(); + thread.canAwake = true; + c.signal(); + } finally { + lock.writeLock().unlock(); + } + + thread.join(); + assertTrue(thread.interrupted); + assertFalse(thread.isAlive()); + } catch (Exception ex) { unexpectedException(); } } @@ -877,6 +1004,53 @@ public class ReentrantReadWriteLockTest } /** + * hasQueuedThread(null) throws NPE + */ + public void testHasQueuedThreadNPE() { + final ReentrantReadWriteLock sync = new ReentrantReadWriteLock(); + try { + sync.hasQueuedThread(null); + shouldThrow(); + } catch (NullPointerException success) { + } + } + + /** + * hasQueuedThread reports whether a thread is queued. + */ + public void testHasQueuedThread() { + final ReentrantReadWriteLock sync = new ReentrantReadWriteLock(); + Thread t1 = new Thread(new InterruptedLockRunnable(sync)); + Thread t2 = new Thread(new InterruptibleLockRunnable(sync)); + try { + assertFalse(sync.hasQueuedThread(t1)); + assertFalse(sync.hasQueuedThread(t2)); + sync.writeLock().lock(); + t1.start(); + Thread.sleep(SHORT_DELAY_MS); + assertTrue(sync.hasQueuedThread(t1)); + t2.start(); + Thread.sleep(SHORT_DELAY_MS); + assertTrue(sync.hasQueuedThread(t1)); + assertTrue(sync.hasQueuedThread(t2)); + t1.interrupt(); + Thread.sleep(SHORT_DELAY_MS); + assertFalse(sync.hasQueuedThread(t1)); + assertTrue(sync.hasQueuedThread(t2)); + sync.writeLock().unlock(); + Thread.sleep(SHORT_DELAY_MS); + assertFalse(sync.hasQueuedThread(t1)); + Thread.sleep(SHORT_DELAY_MS); + assertFalse(sync.hasQueuedThread(t2)); + t1.join(); + t2.join(); + } catch(Exception e){ + unexpectedException(); + } + } + + + /** * getQueueLength reports number of waiting threads */ public void testGetQueueLength() { @@ -938,6 +1112,49 @@ public class ReentrantReadWriteLockTest } /** + * hasWaiters throws NPE if null + */ + public void testHasWaitersNPE() { + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + try { + lock.hasWaiters(null); + shouldThrow(); + } catch (NullPointerException success) { + } catch (Exception ex) { + unexpectedException(); + } + } + + /** + * getWaitQueueLength throws NPE if null + */ + public void testGetWaitQueueLengthNPE() { + final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + try { + lock.getWaitQueueLength(null); + shouldThrow(); + } catch (NullPointerException success) { + } catch (Exception ex) { + unexpectedException(); + } + } + + + /** + * getWaitingThreads throws NPE if null + */ + public void testGetWaitingThreadsNPE() { + final PublicReentrantReadWriteLock lock = new PublicReentrantReadWriteLock(); + try { + lock.getWaitingThreads(null); + shouldThrow(); + } catch (NullPointerException success) { + } catch (Exception ex) { + unexpectedException(); + } + } + + /** * hasWaiters throws IAE if not owned */ public void testHasWaitersIAE() { @@ -1181,4 +1398,49 @@ public class ReentrantReadWriteLockTest } } + /** + * toString indicates current lock state + */ + public void testToString() { + ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + String us = lock.toString(); + assertTrue(us.indexOf("Write locks = 0") >= 0); + assertTrue(us.indexOf("Read locks = 0") >= 0); + lock.writeLock().lock(); + String ws = lock.toString(); + assertTrue(ws.indexOf("Write locks = 1") >= 0); + assertTrue(ws.indexOf("Read locks = 0") >= 0); + lock.writeLock().unlock(); + lock.readLock().lock(); + lock.readLock().lock(); + String rs = lock.toString(); + assertTrue(rs.indexOf("Write locks = 0") >= 0); + assertTrue(rs.indexOf("Read locks = 2") >= 0); + } + + /** + * readLock.toString indicates current lock state + */ + public void testReadLockToString() { + ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + String us = lock.readLock().toString(); + assertTrue(us.indexOf("Read locks = 0") >= 0); + lock.readLock().lock(); + lock.readLock().lock(); + String rs = lock.readLock().toString(); + assertTrue(rs.indexOf("Read locks = 2") >= 0); + } + + /** + * writeLock.toString indicates current lock state + */ + public void testWriteLockToString() { + ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + String us = lock.writeLock().toString(); + assertTrue(us.indexOf("Unlocked") >= 0); + lock.writeLock().lock(); + String ls = lock.writeLock().toString(); + assertTrue(ls.indexOf("Locked") >= 0); + } + }