ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/loops/CollectionLoops.java

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.9 by jsr166, Thu Dec 18 18:43:22 2014 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
#	Line 23 | Line 23 | public class CollectionLoops {
23		int nkeys       = 10000;
24		int nops        = 100000;
25
26	<	Class collectionClass = null;
26	>	Class<?> collectionClass = null;
27		if (args.length > 0) {
28		try {
29		collectionClass = Class.forName(args[0]);
#	Line 65 | Line 65 | public class CollectionLoops {
65		test(4, 100, 100, collectionClass);
66		print = true;
67
68	–	int k = 1;
68		int warmups = 2;
69	<	for (int i = 1; i <= maxThreads;) {
69	>	for (int k = 1, i = 1; i <= maxThreads;) {
70		Thread.sleep(100);
71		test(i, nkeys, nops, collectionClass);
72		if (warmups > 0)
#	Line 104 | Line 103 | public class CollectionLoops {
103		}
104		}
105
106	<	static void test(int i, int nk, int nops, Class collectionClass) throws Exception {
106	>	static void test(int i, int nk, int nops, Class<?> collectionClass) throws Exception {
107		if (print)
108		System.out.print("Threads: " + i + "\t:");
109		Collection<Integer> collection = (Collection<Integer>)collectionClass.newInstance();
#	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