ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/ConcurrentHashMap.java (file contents):
Revision 1.290 by jsr166, Tue Mar 8 00:27:35 2016 UTC vs.
Revision 1.291 by jsr166, Tue Apr 19 22:55:29 2016 UTC

#	Line 268 | Line 268 | public class ConcurrentHashMap<K,V> exte
268		* Table accesses require volatile/atomic reads, writes, and
269		* CASes.  Because there is no other way to arrange this without
270		* adding further indirections, we use intrinsics
271	<	* (sun.misc.Unsafe) operations.
271	>	* (jdk.internal.misc.Unsafe) operations.
272		*
273		* We use the top (sign) bit of Node hash fields for control
274		* purposes -- it is available anyway because of addressing
#	Line 3266 | Line 3266 | public class ConcurrentHashMap<K,V> exte
3266		return true;
3267		}
3268
3269	<	private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
3269	>	private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
3270		private static final long LOCKSTATE;
3271		static {
3272		try {
#	Line 6309 | Line 6309 | public class ConcurrentHashMap<K,V> exte
6309		}
6310
6311		// Unsafe mechanics
6312	<	private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
6312	>	private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
6313		private static final long SIZECTL;
6314		private static final long TRANSFERINDEX;
6315		private static final long BASECOUNT;

Diff Legend

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