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

Comparing jsr166/src/test/loops/CollectionLoops.java (file contents):
Revision 1.5 by jsr166, Tue Nov 3 01:04:02 2009 UTC vs.
Revision 1.11 by jsr166, Sun Oct 23 03:03:23 2016 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 –
7   import java.util.*;
8   import java.util.concurrent.*;
9  
# Line 23 | Line 22 | public class CollectionLoops {
22          int nkeys       = 10000;
23          int nops        = 100000;
24  
25 <        Class collectionClass = null;
25 >        Class<?> collectionClass = null;
26          if (args.length > 0) {
27              try {
28                  collectionClass = Class.forName(args[0]);
# Line 65 | Line 64 | public class CollectionLoops {
64          test(4, 100, 100, collectionClass);
65          print = true;
66  
68 –        int k = 1;
67          int warmups = 2;
68 <        for (int i = 1; i <= maxThreads;) {
68 >        for (int k = 1, i = 1; i <= maxThreads;) {
69              Thread.sleep(100);
70              test(i, nkeys, nops, collectionClass);
71              if (warmups > 0)
# Line 104 | Line 102 | public class CollectionLoops {
102          }
103      }
104  
105 <    static void test(int i, int nk, int nops, Class collectionClass) throws Exception {
105 >    static void test(int i, int nk, int nops, Class<?> collectionClass) throws Exception {
106          if (print)
107              System.out.print("Threads: " + i + "\t:");
108 <        Collection<Integer> collection = (Collection<Integer>)collectionClass.newInstance();
108 >        Collection<Integer> collection =
109 >            (Collection<Integer>) collectionClass.getConstructor().newInstance();
110          Integer[] key = makeKeys(nk);
111          // Uncomment to start with a non-empty table
112          for (int j = 0; j < nk; j += 2)
# Line 141 | Line 140 | public class CollectionLoops {
140          int total;
141          int nops;
142  
143 <        Runner(int id, Collection<Integer> collection, Integer[] key,  CyclicBarrier barrier, int nops) {
143 >        Runner(int id, Collection<Integer> collection, Integer[] key, CyclicBarrier barrier, int nops) {
144              this.collection = collection;
145              this.key = key;
146              this.barrier = barrier;

Diff Legend

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