ViewVC Help

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

root/jsr166/jsr166/src/extra166y/CustomConcurrentHashMap.java

Comparing jsr166/src/extra166y/CustomConcurrentHashMap.java (file contents):
Revision 1.27 by jsr166, Fri Jan 18 04:23:27 2013 UTC vs.
Revision 1.32 by jsr166, Tue Feb 5 19:54:06 2013 UTC

#	Line 224 | Line 224 | public class CustomConcurrentHashMap<K,
224
225		/**
226		* A function computing a mapping from the given key to a value,
227	<	*  or {@code null} if there is no mapping.
227	>	* or {@code null} if there is no mapping.
228		*/
229		public static interface MappingFunction<K, V> {
230		/**
#	Line 245 | Line 245 | public class CustomConcurrentHashMap<K,
245		/**
246		* A function computing a new mapping from the given key and its
247		* current value to a new value, or {@code null} if there is
248	<	* no mapping
248	>	* no mapping.
249		*/
250		public static interface RemappingFunction<K, V> {
251		/**
#	Line 344 | Line 344 | public class CustomConcurrentHashMap<K,
344		* Records the linkage to be returned by the next call to getLinkage.
345		* @param linkage the linkage
346		*/
347	<	void setLinkage(Node r);
347	>	void setLinkage(Node linkage);
348		}
349
350		/**
351		* Each Segment holds a count and table corresponding to a segment
352		* of the table. This class contains only those methods for
353		* directly assigning these fields, which must only be called
354	<	* while holding locks
354	>	* while holding locks.
355		*/
356		static final class Segment extends ReentrantLock {
357		volatile Node[] table;
#	Line 386 | Line 386 | public class CustomConcurrentHashMap<K,
386		}
387
388		/**
389	<	* See the similar code in ConcurrentHashMap for explanation
389	>	* See the similar code in ConcurrentHashMap for explanation.
390		*/
391		final Node[] resizeTable(CustomConcurrentHashMap cchm) {
392		Node[] oldTable = table;
393		if (oldTable == null)
394	<	return table = (Node[])
395	<	new Node[cchm.initialSegmentCapacity];
394	>	return table = new Node[cchm.initialSegmentCapacity];
395
396		int oldCapacity = oldTable.length;
397		if (oldCapacity >= MAX_SEGMENT_CAPACITY)
398		return oldTable;
399	<	Node[] newTable =
401	<	(Node[])new Node[oldCapacity<<1];
399	>	Node[] newTable = new Node[oldCapacity<<1];
400		int sizeMask = newTable.length - 1;
401		NodeFactory fac = cchm.factory;
402		for (int i = 0; i < oldCapacity ; i++) {
#	Line 540 | Line 538 | public class CustomConcurrentHashMap<K,
538		capacity = MAX_SEGMENT_CAPACITY;
539		this.initialSegmentCapacity = capacity;
540		}
541	<	this.segments = (Segment[])new Segment[NSEGMENTS];
541	>	this.segments = new Segment[NSEGMENTS];
542		}
543
544		/**
#	Line 701 | Line 699 | public class CustomConcurrentHashMap<K,
699		*
700		* @param  key   possible key
701		* @return the value associated with the key or {@code null} if
702	<	* there is no mapping.
702	>	* there is no mapping
703		* @throws NullPointerException if the specified key is null
704		*/
705		public V get(Object key) {
#	Line 1092 | Line 1090 | public class CustomConcurrentHashMap<K,
1090		* @param mappingFunction the function to compute a value
1091		* @return the current (existing or computed) value associated with
1092		*         the specified key, or {@code null} if the computation
1093	<	*         returned {@code null}.
1093	>	*         returned {@code null}
1094		* @throws NullPointerException if the specified key or mappingFunction
1095	<	*         is null,
1095	>	*         is null
1096		* @throws RuntimeException or Error if the mappingFunction does so,
1097	<	*         in which case the mapping is left unestablished.
1097	>	*         in which case the mapping is left unestablished
1098		*/
1099		public V computeIfAbsent(K key, MappingFunction<? super K, ? extends V> mappingFunction) {
1100		if (key == null || mappingFunction == null)
#	Line 1167 | Line 1165 | public class CustomConcurrentHashMap<K,
1165		* @return the updated value or
1166		*         {@code null} if the computation returned {@code null}
1167		* @throws NullPointerException if the specified key or remappingFunction
1168	<	*         is null,
1168	>	*         is null
1169		* @throws RuntimeException or Error if the remappingFunction does so,
1170		*         in which case the mapping is left in its previous state
1171		*/
#	Line 1576 | Line 1574 | public class CustomConcurrentHashMap<K,
1574		private void readObject(java.io.ObjectInputStream s)
1575		throws IOException, ClassNotFoundException {
1576		s.defaultReadObject();
1577	<	this.segments = (Segment[])(new Segment[NSEGMENTS]);
1577	>	this.segments = new Segment[NSEGMENTS];
1578		for (;;) {
1579		K key = (K) s.readObject();
1580		V value = (V) s.readObject();
#	Line 1722 | Line 1720 | public class CustomConcurrentHashMap<K,
1720		* to {@link java.lang.ref.Reference} constructors to arrange
1721		* removal of reclaimed nodes from maps via a background thread.
1722		* @return the reference queue associated with the background
1723	<	* cleanup thread.
1723	>	* cleanup thread
1724		*/
1725		static ReferenceQueue<Object> getReclamationQueue() {
1726		ReferenceQueue<Object> q = refQueue;
#	Line 1821 | Line 1819 | public class CustomConcurrentHashMap<K,
1819		super(locator, key);
1820		}
1821		public final Node getLinkage() { return null; }
1822	<	public final void setLinkage(Node r) { }
1822	>	public final void setLinkage(Node linkage) { }
1823		}
1824
1825		static final class LinkedStrongKeySelfValueNode
#	Line 1833 | Line 1831 | public class CustomConcurrentHashMap<K,
1831		this.linkage = linkage;
1832		}
1833		public final Node getLinkage() { return linkage; }
1834	<	public final void setLinkage(Node r) { linkage = r; }
1834	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
1835		}
1836
1837		static final class StrongKeySelfValueNodeFactory
#	Line 1871 | Line 1869 | public class CustomConcurrentHashMap<K,
1869		super(locator, key, value);
1870		}
1871		public final Node getLinkage() { return null; }
1872	<	public final void setLinkage(Node r) { }
1872	>	public final void setLinkage(Node linkage) { }
1873		}
1874
1875		static final class LinkedStrongKeyStrongValueNode
#	Line 1884 | Line 1882 | public class CustomConcurrentHashMap<K,
1882		this.linkage = linkage;
1883		}
1884		public final Node getLinkage() { return linkage; }
1885	<	public final void setLinkage(Node r) { linkage = r; }
1885	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
1886		}
1887
1888		static final class StrongKeyStrongValueNodeFactory
#	Line 1926 | Line 1924 | public class CustomConcurrentHashMap<K,
1924		super(locator, key, value);
1925		}
1926		public final Node getLinkage() { return null; }
1927	<	public final void setLinkage(Node r) { }
1927	>	public final void setLinkage(Node linkage) { }
1928		}
1929
1930		static final class LinkedStrongKeyIntValueNode
#	Line 1939 | Line 1937 | public class CustomConcurrentHashMap<K,
1937		this.linkage = linkage;
1938		}
1939		public final Node getLinkage() { return linkage; }
1940	<	public final void setLinkage(Node r) { linkage = r; }
1940	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
1941		}
1942
1943		static final class StrongKeyIntValueNodeFactory
#	Line 1994 | Line 1992 | public class CustomConcurrentHashMap<K,
1992		super(locator, key, value, cchm);
1993		}
1994		public final Node getLinkage() { return null; }
1995	<	public final void setLinkage(Node r) { }
1995	>	public final void setLinkage(Node linkage) { }
1996		}
1997
1998		static final class LinkedStrongKeyWeakValueNode
#	Line 2008 | Line 2006 | public class CustomConcurrentHashMap<K,
2006		this.linkage = linkage;
2007		}
2008		public final Node getLinkage() { return linkage; }
2009	<	public final void setLinkage(Node r) { linkage = r; }
2009	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2010		}
2011
2012		static final class StrongKeyWeakValueNodeFactory
#	Line 2062 | Line 2060 | public class CustomConcurrentHashMap<K,
2060		super(locator, key, value, cchm);
2061		}
2062		public final Node getLinkage() { return null; }
2063	<	public final void setLinkage(Node r) { }
2063	>	public final void setLinkage(Node linkage) { }
2064		}
2065
2066		static final class LinkedStrongKeySoftValueNode
#	Line 2076 | Line 2074 | public class CustomConcurrentHashMap<K,
2074		this.linkage = linkage;
2075		}
2076		public final Node getLinkage() { return linkage; }
2077	<	public final void setLinkage(Node r) { linkage = r; }
2077	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2078		}
2079
2080		static final class StrongKeySoftValueNodeFactory
#	Line 2130 | Line 2128 | public class CustomConcurrentHashMap<K,
2128		super(locator, key, cchm);
2129		}
2130		public final Node getLinkage() { return null; }
2131	<	public final void setLinkage(Node r) { }
2131	>	public final void setLinkage(Node linkage) { }
2132		}
2133
2134		static final class LinkedWeakKeySelfValueNode
#	Line 2143 | Line 2141 | public class CustomConcurrentHashMap<K,
2141		this.linkage = linkage;
2142		}
2143		public final Node getLinkage() { return linkage; }
2144	<	public final void setLinkage(Node r) { linkage = r; }
2144	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2145		}
2146
2147		static final class WeakKeySelfValueNodeFactory
#	Line 2183 | Line 2181 | public class CustomConcurrentHashMap<K,
2181		super(locator, key, value, cchm);
2182		}
2183		public final Node getLinkage() { return null; }
2184	<	public final void setLinkage(Node r) { }
2184	>	public final void setLinkage(Node linkage) { }
2185		}
2186
2187		static final class LinkedWeakKeyStrongValueNode
#	Line 2197 | Line 2195 | public class CustomConcurrentHashMap<K,
2195		this.linkage = linkage;
2196		}
2197		public final Node getLinkage() { return linkage; }
2198	<	public final void setLinkage(Node r) { linkage = r; }
2198	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2199		}
2200
2201		static final class WeakKeyStrongValueNodeFactory
#	Line 2238 | Line 2236 | public class CustomConcurrentHashMap<K,
2236		super(locator, key, value, cchm);
2237		}
2238		public final Node getLinkage() { return null; }
2239	<	public final void setLinkage(Node r) { }
2239	>	public final void setLinkage(Node linkage) { }
2240		}
2241
2242		static final class LinkedWeakKeyIntValueNode
#	Line 2252 | Line 2250 | public class CustomConcurrentHashMap<K,
2250		this.linkage = linkage;
2251		}
2252		public final Node getLinkage() { return linkage; }
2253	<	public final void setLinkage(Node r) { linkage = r; }
2253	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2254		}
2255
2256		static final class WeakKeyIntValueNodeFactory
#	Line 2300 | Line 2298 | public class CustomConcurrentHashMap<K,
2298		super(locator, key, value, cchm);
2299		}
2300		public final Node getLinkage() { return null; }
2301	<	public final void setLinkage(Node r) { }
2301	>	public final void setLinkage(Node linkage) { }
2302		}
2303
2304		static final class LinkedWeakKeyWeakValueNode
#	Line 2314 | Line 2312 | public class CustomConcurrentHashMap<K,
2312		this.linkage = linkage;
2313		}
2314		public final Node getLinkage() { return linkage; }
2315	<	public final void setLinkage(Node r) { linkage = r; }
2315	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2316		}
2317
2318		static final class WeakKeyWeakValueNodeFactory
#	Line 2363 | Line 2361 | public class CustomConcurrentHashMap<K,
2361		super(locator, key, value, cchm);
2362		}
2363		public final Node getLinkage() { return null; }
2364	<	public final void setLinkage(Node r) { }
2364	>	public final void setLinkage(Node linkage) { }
2365		}
2366
2367		static final class LinkedWeakKeySoftValueNode
#	Line 2377 | Line 2375 | public class CustomConcurrentHashMap<K,
2375		this.linkage = linkage;
2376		}
2377		public final Node getLinkage() { return linkage; }
2378	<	public final void setLinkage(Node r) { linkage = r; }
2378	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2379		}
2380
2381		static final class WeakKeySoftValueNodeFactory
#	Line 2431 | Line 2429 | public class CustomConcurrentHashMap<K,
2429		super(locator, key, cchm);
2430		}
2431		public final Node getLinkage() { return null; }
2432	<	public final void setLinkage(Node r) { }
2432	>	public final void setLinkage(Node linkage) { }
2433		}
2434
2435		static final class LinkedSoftKeySelfValueNode
#	Line 2444 | Line 2442 | public class CustomConcurrentHashMap<K,
2442		this.linkage = linkage;
2443		}
2444		public final Node getLinkage() { return linkage; }
2445	<	public final void setLinkage(Node r) { linkage = r; }
2445	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2446		}
2447
2448		static final class SoftKeySelfValueNodeFactory
#	Line 2484 | Line 2482 | public class CustomConcurrentHashMap<K,
2482		super(locator, key, value, cchm);
2483		}
2484		public final Node getLinkage() { return null; }
2485	<	public final void setLinkage(Node r) { }
2485	>	public final void setLinkage(Node linkage) { }
2486		}
2487
2488		static final class LinkedSoftKeyStrongValueNode
#	Line 2498 | Line 2496 | public class CustomConcurrentHashMap<K,
2496		this.linkage = linkage;
2497		}
2498		public final Node getLinkage() { return linkage; }
2499	<	public final void setLinkage(Node r) { linkage = r; }
2499	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2500		}
2501
2502		static final class SoftKeyStrongValueNodeFactory
#	Line 2539 | Line 2537 | public class CustomConcurrentHashMap<K,
2537		super(locator, key, value, cchm);
2538		}
2539		public final Node getLinkage() { return null; }
2540	<	public final void setLinkage(Node r) { }
2540	>	public final void setLinkage(Node linkage) { }
2541		}
2542
2543		static final class LinkedSoftKeyIntValueNode
#	Line 2553 | Line 2551 | public class CustomConcurrentHashMap<K,
2551		this.linkage = linkage;
2552		}
2553		public final Node getLinkage() { return linkage; }
2554	<	public final void setLinkage(Node r) { linkage = r; }
2554	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2555		}
2556
2557		static final class SoftKeyIntValueNodeFactory
#	Line 2601 | Line 2599 | public class CustomConcurrentHashMap<K,
2599		super(locator, key, value, cchm);
2600		}
2601		public final Node getLinkage() { return null; }
2602	<	public final void setLinkage(Node r) { }
2602	>	public final void setLinkage(Node linkage) { }
2603		}
2604
2605		static final class LinkedSoftKeyWeakValueNode
#	Line 2615 | Line 2613 | public class CustomConcurrentHashMap<K,
2613		this.linkage = linkage;
2614		}
2615		public final Node getLinkage() { return linkage; }
2616	<	public final void setLinkage(Node r) { linkage = r; }
2616	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2617		}
2618
2619		static final class SoftKeyWeakValueNodeFactory
#	Line 2664 | Line 2662 | public class CustomConcurrentHashMap<K,
2662		super(locator, key, value, cchm);
2663		}
2664		public final Node getLinkage() { return null; }
2665	<	public final void setLinkage(Node r) { }
2665	>	public final void setLinkage(Node linkage) { }
2666		}
2667
2668		static final class LinkedSoftKeySoftValueNode
#	Line 2678 | Line 2676 | public class CustomConcurrentHashMap<K,
2676		this.linkage = linkage;
2677		}
2678		public final Node getLinkage() { return linkage; }
2679	<	public final void setLinkage(Node r) { linkage = r; }
2679	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2680		}
2681
2682		static final class SoftKeySoftValueNodeFactory
#	Line 2723 | Line 2721 | public class CustomConcurrentHashMap<K,
2721		super(locator, key);
2722		}
2723		public final Node getLinkage() { return null; }
2724	<	public final void setLinkage(Node r) { }
2724	>	public final void setLinkage(Node linkage) { }
2725		}
2726
2727		static final class LinkedIntKeySelfValueNode
#	Line 2735 | Line 2733 | public class CustomConcurrentHashMap<K,
2733		this.linkage = linkage;
2734		}
2735		public final Node getLinkage() { return linkage; }
2736	<	public final void setLinkage(Node r) { linkage = r; }
2736	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2737		}
2738
2739		static final class IntKeySelfValueNodeFactory
#	Line 2773 | Line 2771 | public class CustomConcurrentHashMap<K,
2771		super(locator, key, value);
2772		}
2773		public final Node getLinkage() { return null; }
2774	<	public final void setLinkage(Node r) { }
2774	>	public final void setLinkage(Node linkage) { }
2775		}
2776
2777		static final class LinkedIntKeyStrongValueNode
#	Line 2786 | Line 2784 | public class CustomConcurrentHashMap<K,
2784		this.linkage = linkage;
2785		}
2786		public final Node getLinkage() { return linkage; }
2787	<	public final void setLinkage(Node r) { linkage = r; }
2787	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2788		}
2789
2790		static final class IntKeyStrongValueNodeFactory
#	Line 2826 | Line 2824 | public class CustomConcurrentHashMap<K,
2824		super(locator, key, value);
2825		}
2826		public final Node getLinkage() { return null; }
2827	<	public final void setLinkage(Node r) { }
2827	>	public final void setLinkage(Node linkage) { }
2828		}
2829
2830		static final class LinkedIntKeyIntValueNode
#	Line 2839 | Line 2837 | public class CustomConcurrentHashMap<K,
2837		this.linkage = linkage;
2838		}
2839		public final Node getLinkage() { return linkage; }
2840	<	public final void setLinkage(Node r) { linkage = r; }
2840	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2841		}
2842
2843		static final class IntKeyIntValueNodeFactory
#	Line 2892 | Line 2890 | public class CustomConcurrentHashMap<K,
2890		super(locator, key, value, cchm);
2891		}
2892		public final Node getLinkage() { return null; }
2893	<	public final void setLinkage(Node r) { }
2893	>	public final void setLinkage(Node linkage) { }
2894		}
2895
2896		static final class LinkedIntKeyWeakValueNode
#	Line 2906 | Line 2904 | public class CustomConcurrentHashMap<K,
2904		this.linkage = linkage;
2905		}
2906		public final Node getLinkage() { return linkage; }
2907	<	public final void setLinkage(Node r) { linkage = r; }
2907	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2908		}
2909
2910		static final class IntKeyWeakValueNodeFactory
#	Line 2960 | Line 2958 | public class CustomConcurrentHashMap<K,
2958		super(locator, key, value, cchm);
2959		}
2960		public final Node getLinkage() { return null; }
2961	<	public final void setLinkage(Node r) { }
2961	>	public final void setLinkage(Node linkage) { }
2962		}
2963
2964		static final class LinkedIntKeySoftValueNode
#	Line 2974 | Line 2972 | public class CustomConcurrentHashMap<K,
2972		this.linkage = linkage;
2973		}
2974		public final Node getLinkage() { return linkage; }
2975	<	public final void setLinkage(Node r) { linkage = r; }
2975	>	public final void setLinkage(Node linkage) { this.linkage = linkage; }
2976		}
2977
2978		static final class IntKeySoftValueNodeFactory
#	Line 3007 | Line 3005 | public class CustomConcurrentHashMap<K,
3005		try {
3006		UNSAFE = getUnsafe();
3007		tableBase = UNSAFE.arrayBaseOffset(Node[].class);
3008	<	int s = UNSAFE.arrayIndexScale(Node[].class);
3009	<	if ((s & (s-1)) != 0)
3008	>	int scale = UNSAFE.arrayIndexScale(Node[].class);
3009	>	if ((scale & (scale - 1)) != 0)
3010		throw new Error("data type scale not a power of two");
3011	<	tableShift = 31 - Integer.numberOfLeadingZeros(s);
3011	>	tableShift = 31 - Integer.numberOfLeadingZeros(scale);
3012		segmentsBase = UNSAFE.arrayBaseOffset(Segment[].class);
3013	<	s = UNSAFE.arrayIndexScale(Segment[].class);
3014	<	if ((s & (s-1)) != 0)
3013	>	scale = UNSAFE.arrayIndexScale(Segment[].class);
3014	>	if ((scale & (scale - 1)) != 0)
3015		throw new Error("data type scale not a power of two");
3016	<	segmentsShift = 31 - Integer.numberOfLeadingZeros(s);
3016	>	segmentsShift = 31 - Integer.numberOfLeadingZeros(scale);
3017		} catch (Throwable e) {
3018		throw new RuntimeException("Could not initialize intrinsics", e);
3019		}

Diff Legend

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