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.16 by jsr166, Sat Nov 13 05:59:24 2010 UTC vs.
Revision 1.20 by jsr166, Mon Dec 5 04:08:47 2011 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		package extra166y;
#	Line 1551 | Line 1551 | public class CustomConcurrentHashMap<K,
1551		}
1552
1553		/**
1554	<	* Save the state of the instance to a stream (i.e., serialize
1555	<	* it).
1554	>	* Saves the state of the instance to a stream (i.e., serializes it).
1555	>	*
1556		* @param s the stream
1557		* @serialData
1558		* the key (Object) and value (Object)
#	Line 1570 | Line 1570 | public class CustomConcurrentHashMap<K,
1570		}
1571
1572		/**
1573	<	* Reconstitute the instance from a stream (i.e., deserialize it).
1573	>	* Reconstitutes the instance from a stream (that is, deserializes it).
1574		* @param s the stream
1575		*/
1576		private void readObject(java.io.ObjectInputStream s)
#	Line 3045 | Line 3045 | public class CustomConcurrentHashMap<K,
3045		}
3046
3047		// Fenced store into segment table array. Unneeded when we have Fences
3048	<	static final  void storeNode(Node[] table,
3049	<	int i, Node r) {
3048	>	static final void storeNode(Node[] table,
3049	>	int i, Node r) {
3050		long nodeOffset = ((long) i << tableShift) + tableBase;
3051		UNSAFE.putOrderedObject(table, nodeOffset, r);
3052		}
3053
3054	<	static final  void storeSegment(Segment[] segs,
3055	<	int i, Segment s) {
3054	>	static final void storeSegment(Segment[] segs,
3055	>	int i, Segment s) {
3056		long segmentOffset = ((long) i << segmentsShift) + segmentsBase;
3057		UNSAFE.putOrderedObject(segs, segmentOffset, s);
3058		}

Diff Legend

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