ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/ConcurrentHashMapV8.java

Comparing jsr166/src/jsr166e/ConcurrentHashMapV8.java (file contents):
Revision 1.32 by jsr166, Sun Dec 4 01:25:16 2011 UTC vs.
Revision 1.33 by jsr166, Mon Dec 5 04:50:19 2011 UTC

#	Line 1150 | Line 1150 | public class ConcurrentHashMapV8<K, V>
1150		continue;
1151		}
1152		else {             // transiently use a locked forwarding node
1153	<	Node g =  new Node(MOVED|LOCKED, nextTab, null, null);
1153	>	Node g = new Node(MOVED|LOCKED, nextTab, null, null);
1154		if (!casTabAt(tab, i, f, g))
1155		continue;
1156		setTabAt(nextTab, i, null);
#	Line 1460 | Line 1460 | public class ConcurrentHashMapV8<K, V>
1460		if (initialCapacity < concurrencyLevel)   // Use at least as many bins
1461		initialCapacity = concurrencyLevel;   // as estimated threads
1462		long size = (long)(1.0 + (long)initialCapacity / loadFactor);
1463	<	int cap =  ((size >= (long)MAXIMUM_CAPACITY) ?
1464	<	MAXIMUM_CAPACITY: tableSizeFor((int)size));
1463	>	int cap = ((size >= (long)MAXIMUM_CAPACITY) ?
1464	>	MAXIMUM_CAPACITY: tableSizeFor((int)size));
1465		this.counter = new LongAdder();
1466		this.sizeCtl = cap;
1467		}
#	Line 2267 | Line 2267 | public class ConcurrentHashMapV8<K, V>
2267		}
2268		}
2269
2270	<	static final class EntrySet<K,V>  extends MapView<K,V>
2270	>	static final class EntrySet<K,V> extends MapView<K,V>
2271		implements Set<Map.Entry<K,V>> {
2272		EntrySet(ConcurrentHashMapV8<K, V> map) { super(map); }
2273

Diff Legend

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