ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/LongAdder.java

Comparing jsr166/src/jsr166e/LongAdder.java (file contents):
Revision 1.11 by jsr166, Sun Jan 6 05:57:42 2013 UTC vs.
Revision 1.16 by jsr166, Mon May 5 01:57:35 2014 UTC

#	Line 6 | Line 6
6
7		package jsr166e;
8		import java.util.concurrent.atomic.AtomicLong;
9	–	import java.io.IOException;
9		import java.io.Serializable;
11	–	import java.io.ObjectInputStream;
12	–	import java.io.ObjectOutputStream;
10
11		/**
12		* One or more variables that together maintain an initially zero
#	Line 58 | Line 55 | public class LongAdder extends Striped64
55		* @param x the value to add
56		*/
57		public void add(long x) {
58	<	Cell[] as; long b, v; HashCode hc; Cell a; int n;
58	>	Cell[] as; long b, v; int[] hc; Cell a; int n;
59		if ((as = cells) != null || !casBase(b = base, b + x)) {
60		boolean uncontended = true;
61	<	int h = (hc = threadHashCode.get()).code;
62	<	if (as == null || (n = as.length) < 1 ||
63	<	(a = as[(n - 1) & h]) == null ||
61	>	if ((hc = threadHashCode.get()) == null ||
62	>	as == null || (n = as.length) < 1 ||
63	>	(a = as[(n - 1) & hc[0]]) == null ||
64		!(uncontended = a.cas(v = a.value, v + x)))
65		retryUpdate(x, hc, uncontended);
66		}
#	Line 85 | Line 82 | public class LongAdder extends Striped64
82
83		/**
84		* Returns the current sum.  The returned value is <em>NOT</em> an
85	<	* atomic snapshot: Invocation in the absence of concurrent
85	>	* atomic snapshot; invocation in the absence of concurrent
86		* updates returns an accurate result, but concurrent updates that
87		* occur while the sum is being calculated might not be
88		* incorporated.
#	Line 191 | Line 188 | public class LongAdder extends Striped64
188		s.writeLong(sum());
189		}
190
191	<	private void readObject(ObjectInputStream s)
192	<	throws IOException, ClassNotFoundException {
191	>	private void readObject(java.io.ObjectInputStream s)
192	>	throws java.io.IOException, ClassNotFoundException {
193		s.defaultReadObject();
194		busy = 0;
195		cells = null;

Diff Legend

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