ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/loops/SimpleMutexLoops.java
(Generate patch)

Comparing jsr166/src/test/loops/SimpleMutexLoops.java (file contents):
Revision 1.1 by dl, Mon May 2 19:19:38 2005 UTC vs.
Revision 1.5 by jsr166, Tue Nov 3 01:04:02 2009 UTC

# Line 1 | Line 1
1   /*
2 * @test
3 * @synopsis multiple threads using a single lock
4 */
5 /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain. Use, modify, and
4 < * redistribute this code in any way without acknowledgement.
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
5   */
6  
7   import java.util.concurrent.*;
# Line 20 | Line 16 | public final class SimpleMutexLoops {
16  
17      public static void main(String[] args) throws Exception {
18          int maxThreads = 100;
19 <        if (args.length > 0)
19 >        if (args.length > 0)
20              maxThreads = Integer.parseInt(args[0]);
21  
22          new MutexLoop(1).test();
# Line 35 | Line 31 | public final class SimpleMutexLoops {
31              if (i == k) {
32                  k = i << 1;
33                  i = i + (i >>> 1);
34 <            }
35 <            else
34 >            }
35 >            else
36                  i = k;
37          }
38          pool.shutdown();
# Line 56 | Line 52 | public final class SimpleMutexLoops {
52          }
53  
54          final void test() throws Exception {
55 <            for (int i = 0; i < nthreads; ++i)
55 >            for (int i = 0; i < nthreads; ++i)
56                  pool.execute(this);
57              barrier.await();
58              barrier.await();
59              if (print) {
60                  long time = timer.getTime();
61 <                long tpi = time / ((long)iters * nthreads);
61 >                long tpi = time / ((long) iters * nthreads);
62                  System.out.print("\t" + LoopHelpers.rightJustify(tpi) + " ns per lock");
63 <                double secs = (double)(time) / 1000000000.0;
63 >                double secs = (double) time / 1000000000.0;
64                  System.out.println("\t " + secs + "s run time");
65              }
66  
# Line 76 | Line 72 | public final class SimpleMutexLoops {
72          public final void run() {
73              final Mutex lock = this.lock;
74              try {
75 <                barrier.await();
75 >                barrier.await();
76                  int sum = v + 1;
77                  int x = 0;
78                  int n = iters;
# Line 86 | Line 82 | public final class SimpleMutexLoops {
82                      if (k > 0) {
83                          x = v;
84                          while (k-- > 0)
85 <                            x = LoopHelpers.compute4(x);
85 >                            x = LoopHelpers.compute6(x);
86                          v = x;
87                      }
88                      else x = sum + 1;
# Line 94 | Line 90 | public final class SimpleMutexLoops {
90                      if ((x += readBarrier) == 0)
91                          ++readBarrier;
92                      for (int l = x & 7; l > 0; --l)
93 <                        sum += LoopHelpers.compute4(sum);
94 <                }
93 >                        sum += LoopHelpers.compute6(sum);
94 >                }
95                  barrier.await();
96                  result += sum;
97              }
98 <            catch (Exception ie) {
99 <                return;
98 >            catch (Exception ie) {
99 >                return;
100              }
101          }
102      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines