ViewVC Help

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

root/jsr166/jsr166/src/jsr166y/LinkedTransferQueue.java

Comparing jsr166/src/jsr166y/LinkedTransferQueue.java (file contents):
Revision 1.18 by jsr166, Mon Jul 20 22:26:03 2009 UTC vs.
Revision 1.20 by jsr166, Tue Jul 21 18:11:44 2009 UTC

#	Line 765 | Line 765 | public class LinkedTransferQueue<E> exte
765		/**
766		* Reconstitute the Queue instance from a stream (that is,
767		* deserialize it).
768	+	*
769		* @param s the stream
770		*/
771		private void readObject(java.io.ObjectInputStream s)
#	Line 784 | Line 785 | public class LinkedTransferQueue<E> exte
785		// Support for resetting head/tail while deserializing
786		private void resetHeadAndTail() {
787		QNode dummy = new QNode(null, false);
788	<	_unsafe.putObjectVolatile(this, headOffset,
788	>	UNSAFE.putObjectVolatile(this, headOffset,
789		new PaddedAtomicReference<QNode>(dummy));
790	<	_unsafe.putObjectVolatile(this, tailOffset,
790	>	UNSAFE.putObjectVolatile(this, tailOffset,
791		new PaddedAtomicReference<QNode>(dummy));
792	<	_unsafe.putObjectVolatile(this, cleanMeOffset,
792	>	UNSAFE.putObjectVolatile(this, cleanMeOffset,
793		new PaddedAtomicReference<QNode>(null));
794		}
795
#	Line 818 | Line 819 | public class LinkedTransferQueue<E> exte
819
820		private static long fieldOffset(String fieldName)
821		throws NoSuchFieldException {
822	<	return _unsafe.objectFieldOffset
822	>	return UNSAFE.objectFieldOffset
823		(LinkedTransferQueue.class.getDeclaredField(fieldName));
824		}
825
826	<	private static final Unsafe _unsafe;
826	>	private static final Unsafe UNSAFE;
827		private static final long headOffset;
828		private static final long tailOffset;
829		private static final long cleanMeOffset;
830		static {
831		try {
832	<	_unsafe = getUnsafe();
832	>	UNSAFE = getUnsafe();
833		headOffset = fieldOffset("head");
834		tailOffset = fieldOffset("tail");
835		cleanMeOffset = fieldOffset("cleanMe");

Diff Legend

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