--- jsr166/src/test/loops/UncheckedLockLoops.java 2009/10/29 23:09:08 1.4 +++ jsr166/src/test/loops/UncheckedLockLoops.java 2010/09/27 19:15:16 1.8 @@ -53,7 +53,7 @@ public final class UncheckedLockLoops { } static void oneTest(int nthreads, int iters) throws Exception { - int fairIters = (nthreads <= 1)? iters : iters/20; + int fairIters = (nthreads <= 1) ? iters : iters/20; int v = rng.next(); if (print) @@ -121,7 +121,7 @@ public final class UncheckedLockLoops { } - static abstract class LockLoop implements Runnable { + abstract static class LockLoop implements Runnable { int value; int checkValue; int iters; @@ -155,7 +155,7 @@ public final class UncheckedLockLoops { if (print) { long tpi = time / (iters * nthreads); System.out.print("\t" + LoopHelpers.rightJustify(tpi) + " ns per update"); - // double secs = (double)(time) / 1000000000.0; + // double secs = (double) time / 1000000000.0; // System.out.print("\t " + secs + "s run time"); System.out.println(); } @@ -201,7 +201,7 @@ public final class UncheckedLockLoops { int sum = 0; int x = 0; while (n-- > 0) { - synchronized(this) { + synchronized (this) { x = setValue(LoopHelpers.compute1(getValue())); } sum += LoopHelpers.compute2(x); @@ -211,7 +211,7 @@ public final class UncheckedLockLoops { } private static class ReentrantLockLoop extends LockLoop { - final private ReentrantLock lock = new ReentrantLock(); + private final ReentrantLock lock = new ReentrantLock(); final int loop(int n) { final ReentrantLock lock = this.lock; int sum = 0; @@ -231,7 +231,7 @@ public final class UncheckedLockLoops { } private static class MutexLoop extends LockLoop { - final private Mutex lock = new Mutex(); + private final Mutex lock = new Mutex(); final int loop(int n) { final Mutex lock = this.lock; int sum = 0; @@ -251,7 +251,7 @@ public final class UncheckedLockLoops { } private static class LongMutexLoop extends LockLoop { - final private LongMutex lock = new LongMutex(); + private final LongMutex lock = new LongMutex(); final int loop(int n) { final LongMutex lock = this.lock; int sum = 0; @@ -271,7 +271,7 @@ public final class UncheckedLockLoops { } private static class FairReentrantLockLoop extends LockLoop { - final private ReentrantLock lock = new ReentrantLock(true); + private final ReentrantLock lock = new ReentrantLock(true); final int loop(int n) { final ReentrantLock lock = this.lock; int sum = 0; @@ -291,7 +291,7 @@ public final class UncheckedLockLoops { } private static class ReentrantWriteLockLoop extends LockLoop { - final private Lock lock = new ReentrantReadWriteLock().writeLock(); + private final Lock lock = new ReentrantReadWriteLock().writeLock(); final int loop(int n) { final Lock lock = this.lock; int sum = 0; @@ -331,7 +331,7 @@ public final class UncheckedLockLoops { } private static class SemaphoreLoop extends LockLoop { - final private Semaphore sem = new Semaphore(1, false); + private final Semaphore sem = new Semaphore(1, false); final int loop(int n) { final Semaphore sem = this.sem; int sum = 0; @@ -350,7 +350,7 @@ public final class UncheckedLockLoops { } } private static class FairSemaphoreLoop extends LockLoop { - final private Semaphore sem = new Semaphore(1, true); + private final Semaphore sem = new Semaphore(1, true); final int loop(int n) { final Semaphore sem = this.sem; int sum = 0; @@ -370,7 +370,7 @@ public final class UncheckedLockLoops { } private static class ReentrantReadWriteLockLoop extends LockLoop { - final private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); final int loop(int n) { final Lock rlock = lock.readLock(); final Lock wlock = lock.writeLock(); @@ -405,7 +405,7 @@ public final class UncheckedLockLoops { private static class FairReentrantReadWriteLockLoop extends LockLoop { - final private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true); + private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(true); final int loop(int n) { final Lock rlock = lock.readLock(); final Lock wlock = lock.writeLock();