--- jsr166/src/test/loops/CheckedLockLoops.java 2010/09/27 19:15:15 1.7 +++ jsr166/src/test/loops/CheckedLockLoops.java 2016/12/31 22:17:40 1.13 @@ -1,16 +1,20 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ */ /* * @test * @summary basic safety and liveness of ReentrantLocks, and other locks based on them */ -import java.util.concurrent.*; -import java.util.concurrent.locks.*; -import java.util.*; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Semaphore; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; public final class CheckedLockLoops { static final ExecutorService pool = Executors.newCachedThreadPool(); @@ -31,8 +35,7 @@ public final class CheckedLockLoops { static void runTest(int maxThreads, int iters) throws Exception { print = true; - int k = 1; - for (int i = 1; i <= maxThreads;) { + for (int k = 1, i = 1; i <= maxThreads;) { System.out.println("Threads:" + i); oneTest(i, iters / i); if (i == k) { @@ -399,7 +402,6 @@ public final class CheckedLockLoops { } - private static class FairReentrantReadWriteLockLoop extends LockLoop { private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true); final int loop(int n) {