--- jsr166/src/test/loops/SimpleLockLoops.java	2005/05/02 19:19:38	1.1
+++ jsr166/src/test/loops/SimpleLockLoops.java	2009/11/03 01:04:02	1.6
@@ -1,11 +1,7 @@
 /*
- * @test
- * @synopsis multiple threads using a single builtin lock
- */
-/*
  * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain. Use, modify, and
- * redistribute this code in any way without acknowledgement.
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
  */
 
 import java.util.concurrent.*;
@@ -20,50 +16,51 @@ public final class SimpleLockLoops {
 
     public static void main(String[] args) throws Exception {
         int maxThreads = 100;
-        if (args.length > 0) 
+        if (args.length > 0)
             maxThreads = Integer.parseInt(args[0]);
 
-        new ReentrantLockLoop(1).test();
-        new ReentrantLockLoop(1).test();
+        new LockLoop(1).test();
+        new LockLoop(1).test();
         print = true;
 
         int k = 1;
         for (int i = 1; i <= maxThreads;) {
             System.out.print("Threads: " + i);
-            new ReentrantLockLoop(i).test();
+            new LockLoop(i).test();
             Thread.sleep(100);
             if (i == k) {
                 k = i << 1;
                 i = i + (i >>> 1);
-            } 
-            else 
+            }
+            else
                 i = k;
         }
         pool.shutdown();
     }
 
-    static final class ReentrantLockLoop implements Runnable {
+    static final class LockLoop implements Runnable {
         private int v = rng.next();
         private volatile int result = 17;
+        private final Object lock = new Object();
         private final LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         private final CyclicBarrier barrier;
         private final int nthreads;
         private volatile int readBarrier;
-        ReentrantLockLoop(int nthreads) {
+        LockLoop(int nthreads) {
             this.nthreads = nthreads;
             barrier = new CyclicBarrier(nthreads+1, timer);
         }
 
         final void test() throws Exception {
-            for (int i = 0; i < nthreads; ++i) 
+            for (int i = 0; i < nthreads; ++i)
                 pool.execute(this);
             barrier.await();
             barrier.await();
             if (print) {
                 long time = timer.getTime();
-                long tpi = time / ((long)iters * nthreads);
+                long tpi = time / ((long) iters * nthreads);
                 System.out.print("\t" + LoopHelpers.rightJustify(tpi) + " ns per lock");
-                double secs = (double)(time) / 1000000000.0;
+                double secs = (double) time / 1000000000.0;
                 System.out.println("\t " + secs + "s run time");
             }
 
@@ -73,18 +70,19 @@ public final class SimpleLockLoops {
         }
 
         public final void run() {
+            final Object lock = this.lock;
             try {
-                barrier.await(); 
+                barrier.await();
                 int sum = v + 1;
                 int x = 0;
                 int n = iters;
                 while (n-- > 0) {
-                    synchronized(this) {
+                    synchronized(lock) {
                         int k = (sum & 3);
                         if (k > 0) {
                             x = v;
                             while (k-- > 0)
-                                x = LoopHelpers.compute4(x);
+                                x = LoopHelpers.compute6(x);
                             v = x;
                         }
                         else x = sum + 1;
@@ -92,16 +90,15 @@ public final class SimpleLockLoops {
                     if ((x += readBarrier) == 0)
                         ++readBarrier;
                     for (int l = x & 7; l > 0; --l)
-                        sum += LoopHelpers.compute4(sum);
-                } 
+                        sum += LoopHelpers.compute6(sum);
+                }
                 barrier.await();
                 result += sum;
             }
-            catch (Exception ie) { 
-                return; 
+            catch (Exception ie) {
+                return;
             }
         }
     }
 
 }
-