ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/DoubleAdder.java

Comparing jsr166/src/jsr166e/DoubleAdder.java (file contents):
Revision 1.5 by jsr166, Sun Nov 18 03:07:22 2012 UTC vs.
Revision 1.10 by jsr166, Mon Jan 14 20:30:22 2013 UTC

#	Line 5 | Line 5
5		*/
6
7		package jsr166e;
8	–	import java.io.IOException;
8		import java.io.Serializable;
10	–	import java.io.ObjectInputStream;
11	–	import java.io.ObjectOutputStream;
9
10		/**
11		* One or more variables that together maintain an initially zero
#	Line 19 | Line 16 | import java.io.ObjectOutputStream;
16		* variables maintaining the sum.
17		*
18		* <p>This class extends {@link Number}, but does <em>not</em> define
19	<	* methods such as {@code hashCode} and {@code compareTo} because
20	<	* instances are expected to be mutated, and so are not useful as
21	<	* collection keys.
19	>	* methods such as {@code equals}, {@code hashCode} and {@code
20	>	* compareTo} because instances are expected to be mutated, and so are
21	>	* not useful as collection keys.
22		*
23		* <p><em>jsr166e note: This class is targeted to be placed in
24		* java.util.concurrent.atomic.</em>
#	Line 80 | Line 77 | public class DoubleAdder extends Striped
77
78		/**
79		* Returns the current sum.  The returned value is <em>NOT</em> an
80	<	* atomic snapshot: Invocation in the absence of concurrent
80	>	* atomic snapshot; invocation in the absence of concurrent
81		* updates returns an accurate result, but concurrent updates that
82		* occur while the sum is being calculated might not be
83	<	* incorporated.  Also, because double-precision arithmetic is not
83	>	* incorporated.  Also, because floating-point arithmetic is not
84		* strictly associative, the returned result need not be identical
85		* to the value that would be obtained in a sequential series of
86		* updates to a single variable.
#	Line 190 | Line 187 | public class DoubleAdder extends Striped
187		s.writeDouble(sum());
188		}
189
190	<	private void readObject(ObjectInputStream s)
191	<	throws IOException, ClassNotFoundException {
190	>	private void readObject(java.io.ObjectInputStream s)
191	>	throws java.io.IOException, ClassNotFoundException {
192		s.defaultReadObject();
193		busy = 0;
194		cells = null;

Diff Legend

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