ViewVC Help

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

root/jsr166/jsr166/src/jdk7/java/util/concurrent/ConcurrentHashMap.java

Comparing jsr166/src/jdk7/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.24 by jsr166, Tue Jun 18 18:39:14 2013 UTC vs.
Revision 1.25 by jsr166, Tue Jun 18 19:31:13 2013 UTC

#	Line 1830 | Line 1830 | public class ConcurrentHashMap<K,V> impl
1830		}
1831
1832		/**
1833	<	* Returns a list on non-TreeNodes replacing those in given list
1833	>	* Returns a list on non-TreeNodes replacing those in given list.
1834		*/
1835		static <K,V> Node<K,V> untreeify(Node<K,V> b) {
1836		Node<K,V> hd = null, tl = null;
#	Line 1968 | Line 1968 | public class ConcurrentHashMap<K,V> impl
1968		}
1969
1970		/**
1971	<	* Acquires write lock for tree restructuring
1971	>	* Acquires write lock for tree restructuring.
1972		*/
1973		private final void lockRoot() {
1974		if (!U.compareAndSwapInt(this, LOCKSTATE, 0, WRITER))
#	Line 1976 | Line 1976 | public class ConcurrentHashMap<K,V> impl
1976		}
1977
1978		/**
1979	<	* Releases write lock for tree restructuring
1979	>	* Releases write lock for tree restructuring.
1980		*/
1981		private final void unlockRoot() {
1982		lockState = 0;
1983		}
1984
1985		/**
1986	<	* Possibly blocks awaiting root lock
1986	>	* Possibly blocks awaiting root lock.
1987		*/
1988		private final void contendedLock() {
1989		boolean waiting = false;
#	Line 2502 | Line 2502 | public class ConcurrentHashMap<K,V> impl
2502
2503		/**
2504		* Base of key, value, and entry Iterators. Adds fields to
2505	<	* Traverser to support iterator.remove
2505	>	* Traverser to support iterator.remove.
2506		*/
2507		static class BaseIterator<K,V> extends Traverser<K,V> {
2508		final ConcurrentHashMap<K,V> map;
#	Line 3031 | Line 3031 | public class ConcurrentHashMap<K,V> impl
3031		}
3032
3033		/**
3034	<	* Generates initial value for per-thread CounterHashCodes
3034	>	* Generates initial value for per-thread CounterHashCodes.
3035		*/
3036		static final AtomicInteger counterHashCodeGenerator = new AtomicInteger();
3037

Diff Legend

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