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)); |
62 |
|
System.out.println(); |
63 |
|
|
64 |
|
int warmups = 2; |
65 |
< |
for (int k = 1, 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 |
|
} |
75 |
– |
else |
76 |
– |
i = k; |
83 |
|
} |
84 |
|
pool.shutdown(); |
85 |
|
} |
132 |
|
int position; |
133 |
|
int total; |
134 |
|
|
135 |
< |
Runner(int id, Map<Integer,Integer> map, Integer[] key, CyclicBarrier barrier) { |
135 |
> |
Runner(int id, Map<Integer,Integer> map, Integer[] key, CyclicBarrier barrier) { |
136 |
|
this.map = map; |
137 |
|
this.key = key; |
138 |
|
this.barrier = barrier; |
164 |
|
} |
165 |
|
else if (r < insertsPerMaxRandom) { |
166 |
|
++position; |
167 |
< |
map.put(k, k); |
167 |
> |
map.putIfAbsent(k, k); |
168 |
|
return 2; |
169 |
|
} |
170 |
|
|