--- jsr166/src/test/loops/MultipleProducersSingleConsumerLoops.java	2009/10/23 19:57:06	1.4
+++ jsr166/src/test/loops/MultipleProducersSingleConsumerLoops.java	2009/10/29 23:09:07	1.5
@@ -34,14 +34,14 @@ public class MultipleProducersSingleCons
     static final int POOL_MASK = POOL_SIZE-1;
     static final Integer[] intPool = new Integer[POOL_SIZE];
     static {
-        for (int i = 0; i < POOL_SIZE; ++i) 
+        for (int i = 0; i < POOL_SIZE; ++i)
             intPool[i] = Integer.valueOf(i);
     }
 
     // Number of puts by producers or takes by consumers
     static final int ITERS = 1 << 20;
 
-    // max lag between a producer and consumer to avoid 
+    // max lag between a producer and consumer to avoid
     // this becoming a GC test rather than queue test.
     static final int LAG = (1 << 12);
     static final int LAG_MASK = LAG - 1;
@@ -49,7 +49,7 @@ public class MultipleProducersSingleCons
     public static void main(String[] args) throws Exception {
         int maxn = 12; // NCPUS * 3 / 2;
 
-        if (args.length > 0) 
+        if (args.length > 0)
             maxn = Integer.parseInt(args[0]);
 
         warmup();
@@ -61,8 +61,8 @@ public class MultipleProducersSingleCons
             if (i == k) {
                 k = i << 1;
                 i = i + (i >>> 1);
-            } 
-            else 
+            }
+            else
                 i = k;
         }
         pool.shutdown();
@@ -73,14 +73,14 @@ public class MultipleProducersSingleCons
         System.out.print("Warmup ");
         int it = 2000;
         for (int j = 5; j > 0; --j) {
-            oneTest(j, it); 
+            oneTest(j, it);
             System.out.print(".");
             it += 1000;
         }
         System.gc();
         it = 20000;
         for (int j = 5; j > 0; --j) {
-            oneTest(j, it); 
+            oneTest(j, it);
             System.out.print(".");
             it += 10000;
         }
@@ -110,7 +110,7 @@ public class MultipleProducersSingleCons
         if (print)
             System.out.print("LinkedBlockingDeque     ");
         oneRun(new LinkedBlockingDeque<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("ArrayBlockingQueue      ");
@@ -121,7 +121,7 @@ public class MultipleProducersSingleCons
             System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), n, iters);
 
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("SynchronousQueue(fair)  ");
@@ -136,7 +136,7 @@ public class MultipleProducersSingleCons
         if (print)
             System.out.print("LinkedTransferQueue(half)");
         oneRun(new HalfSyncLTQ<Integer>(), n, iters);
-        
+
         Thread.sleep(100); // System.gc();
         if (print)
             System.out.print("PriorityBlockingQueue   ");
@@ -149,7 +149,7 @@ public class MultipleProducersSingleCons
 
 
     }
-    
+
     static abstract class Stage implements Runnable {
         final int iters;
         final BlockingQueue<Integer> queue;
@@ -158,7 +158,7 @@ public class MultipleProducersSingleCons
         final int lag;
         Stage (BlockingQueue<Integer> q, CyclicBarrier b, Phaser s,
                int iters, int lag) {
-            queue = q; 
+            queue = q;
             barrier = b;
             lagPhaser = s;
             this.iters = iters;
@@ -192,16 +192,16 @@ public class MultipleProducersSingleCons
                 addProducerSum(ps);
                 barrier.await();
             }
-            catch (Exception ie) { 
-                ie.printStackTrace(); 
-                return; 
+            catch (Exception ie) {
+                ie.printStackTrace();
+                return;
             }
         }
     }
 
     static class Consumer extends Stage {
         Consumer(BlockingQueue<Integer> q, CyclicBarrier b, Phaser s,
-                 int iters, int lag) { 
+                 int iters, int lag) {
             super(q, b, s, iters, lag);
         }
 
@@ -222,9 +222,9 @@ public class MultipleProducersSingleCons
                 addConsumerSum(cs);
                 barrier.await();
             }
-            catch (Exception ie) { 
-                ie.printStackTrace(); 
-                return; 
+            catch (Exception ie) {
+                ie.printStackTrace();
+                return;
             }
         }
 
@@ -247,11 +247,11 @@ public class MultipleProducersSingleCons
         if (print)
             System.out.println("\t: " + LoopHelpers.rightJustify(time / (iters * (n + 1))) + " ns per transfer");
     }
-    
+
     static final class LTQasSQ<T> extends LinkedTransferQueue<T> {
         LTQasSQ() { super(); }
         public void put(T x) {
-            try { super.transfer(x); 
+            try { super.transfer(x);
             } catch (InterruptedException ex) { throw new Error(); }
         }
     }
@@ -263,12 +263,11 @@ public class MultipleProducersSingleCons
             if ((++calls & 1) == 0)
                 super.put(x);
             else {
-                try { super.transfer(x); 
-                } catch (InterruptedException ex) { 
-                    throw new Error(); 
+                try { super.transfer(x);
+                } catch (InterruptedException ex) {
+                    throw new Error();
                 }
             }
         }
     }
 }
-