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

Comparing jsr166/src/test/loops/MapLoops.java (file contents):
Revision 1.6 by jsr166, Tue Nov 3 01:04:02 2009 UTC vs.
Revision 1.12 by dl, Sat Sep 12 19:36:34 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   import java.util.*;
# Line 20 | Line 20 | public class MapLoops {
20  
21      public static void main(String[] args) throws Exception {
22  
23 <        Class mapClass = null;
23 >        Class<?> mapClass = null;
24          if (args.length > 0) {
25              try {
26                  mapClass = Class.forName(args[0]);
# Line 46 | Line 46 | public class MapLoops {
46          if (args.length > 5)
47              nops = Integer.parseInt(args[5]);
48  
49 +        if (nops < nkeys)
50 +            nops = nkeys;
51 +
52          // normalize probabilities wrt random number generator
53          removesPerMaxRandom = (int)(((double)premove/100.0 * 0x7FFFFFFFL));
54          insertsPerMaxRandom = (int)(((double)pinsert/100.0 * 0x7FFFFFFFL));
# Line 58 | Line 61 | public class MapLoops {
61          System.out.print(" ops: " + nops);
62          System.out.println();
63  
61 –        int k = 1;
64          int warmups = 2;
65 <        for (int i = 1; i <= maxThreads;) {
66 <            Thread.sleep(100);
67 <            test(i, nkeys, mapClass);
68 <            if (warmups > 0)
69 <                --warmups;
70 <            else if (i == k) {
71 <                k = i << 1;
72 <                i = i + (i >>> 1);
73 <            }
74 <            else if (i == 1 && k == 2) {
75 <                i = k;
76 <                warmups = 1;
65 >        for (int reps = 0; reps < 3; ++reps) {
66 >            int k = 1;
67 >            for (int i = 1; i <= maxThreads;) {
68 >                Thread.sleep(100);
69 >                test(i, nkeys, mapClass);
70 >                if (warmups > 0)
71 >                    --warmups;
72 >                else if (i == k) {
73 >                    k = i << 1;
74 >                    i = i + (i >>> 1);
75 >                }
76 >                else if (i == 1 && k == 2) {
77 >                    i = k;
78 >                    warmups = 1;
79 >                }
80 >                else
81 >                    i = k;
82              }
76 –            else
77 –                i = k;
83          }
84          pool.shutdown();
85      }
# Line 97 | Line 102 | public class MapLoops {
102          }
103      }
104  
105 <    static void test(int i, int nkeys, Class mapClass) throws Exception {
105 >    static void test(int i, int nkeys, Class<?> mapClass) throws Exception {
106          System.out.print("Threads: " + i + "\t:");
107          Map<Integer, Integer> map = (Map<Integer,Integer>)mapClass.newInstance();
108          Integer[] key = makeKeys(nkeys);
# Line 137 | Line 142 | public class MapLoops {
142          }
143  
144          int step() {
145 <            // random-walk around key positions,  bunching accesses
145 >            // random-walk around key positions, bunching accesses
146              int r = rng.next();
147              position += (r & 7) - 3;
148              while (position >= key.length) position -= key.length;
# Line 159 | Line 164 | public class MapLoops {
164              }
165              else if (r < insertsPerMaxRandom) {
166                  ++position;
167 <                map.put(k, k);
167 >                map.putIfAbsent(k, k);
168                  return 2;
169              }
170  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines