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

Comparing jsr166/src/test/loops/MapMicroBenchmark.java (file contents):
Revision 1.14 by jsr166, Wed Mar 5 17:31:06 2014 UTC vs.
Revision 1.18 by jsr166, Sun Oct 23 03:03:23 2016 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 import java.util.*;
7   import java.io.*;
8   import java.math.*;
9 + import java.util.*;
10  
11   /**
12   * A micro-benchmark with key types and operation mixes roughly
# Line 38 | Line 38 | import java.math.*;
38   public class MapMicroBenchmark {
39      static final String wordFile = "testwords.txt";
40  
41 <    static Class mapClass;
41 >    static Class<?> mapClass;
42      static boolean randomSearches = true;
43  
44      // Nanoseconds per run
# Line 210 | Line 210 | public class MapMicroBenchmark {
210          System.out.println("\n");
211      }
212  
213
213      static final class Job {
214          final String name;
215 <        final Class elementClass;
215 >        final Class<?> elementClass;
216          long[] nanos = new long[nsizes];
217          final Object[] items;
218          Object[] searches;
219          volatile long checkSum;
220          volatile int lastSum;
221 <        Job(String name, Object[] items, Class elementClass) {
221 >        Job(String name, Object[] items, Class<?> elementClass) {
222              this.name = name;
223              this.items = items;
224              this.elementClass = elementClass;
# Line 234 | Line 233 | public class MapMicroBenchmark {
233          }
234  
235          public long work(int len, int minIters, int maxIters, long timeLimit) {
236 <            Map m;
236 >            final Map m;
237              try {
238 <                m = (Map) mapClass.newInstance();
238 >                m = (Map) mapClass.getConstructor().newInstance();
239              } catch (Exception e) {
240                  throw new RuntimeException("Can't instantiate " + mapClass + ": " + e);
241              }
# Line 363 | Line 362 | public class MapMicroBenchmark {
362  
363      }
364  
366
365      static final Random rng = new Random(3122688);
366  
367      // Shuffle the subarrays for each size. This doesn't fully

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines