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.19 by jsr166, Tue Oct 25 18:46:37 2011 UTC vs.
Revision 1.21 by jsr166, Tue Feb 21 01:54:03 2012 UTC

#	Line 942 | Line 942 | public class CustomConcurrentHashMap<K,
942		}
943
944		/**
945	<	* Remove node if its key or value are null
945	>	* Removes node if its key or value are null.
946		*/
947		final void removeIfReclaimed(Node r) {
948		int hash = r.getLocator();
#	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