Merge pull request #3109 from akarnokd/InternalUtilAtomicTests

Unit tests and cleanup of JCTools' queues.

Author: akarnokd

src/main/java/rx/internal/util/atomic/MpscLinkedAtomicQueue.java

@@ -58,7 +58,7 @@ public MpscLinkedAtomicQueue() {
     @Override
     public final boolean offer(final E nextValue) {
         if (nextValue == null) {
-            throw new IllegalArgumentException("null elements not allowed");
+            throw new NullPointerException("null elements not allowed");
         }
         final LinkedQueueNode<E> nextNode = new LinkedQueueNode<E>(nextValue);
         final LinkedQueueNode<E> prevProducerNode = xchgProducerNode(nextNode);

src/main/java/rx/internal/util/atomic/SpscLinkedAtomicQueue.java

@@ -59,7 +59,7 @@ public SpscLinkedAtomicQueue() {
     @Override
     public boolean offer(final E nextValue) {
         if (nextValue == null) {
-            throw new IllegalArgumentException("null elements not allowed");
+            throw new NullPointerException("null elements not allowed");
         }
         final LinkedQueueNode<E> nextNode = new LinkedQueueNode<E>(nextValue);
         lpProducerNode().soNext(nextNode);

src/main/java/rx/internal/util/unsafe/MpmcArrayQueue.java

@@ -28,15 +28,7 @@ public MpmcArrayQueueL1Pad(int capacity) {
 }
 
 abstract class MpmcArrayQueueProducerField<E> extends MpmcArrayQueueL1Pad<E> {
-    private final static long P_INDEX_OFFSET;
-    static {
-        try {
-            P_INDEX_OFFSET = UNSAFE.objectFieldOffset(MpmcArrayQueueProducerField.class
-                    .getDeclaredField("producerIndex"));
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    private final static long P_INDEX_OFFSET = UnsafeAccess.addressOf(MpmcArrayQueueProducerField.class, "producerIndex");
     private volatile long producerIndex;
 
     public MpmcArrayQueueProducerField(int capacity) {
@@ -62,15 +54,7 @@ public MpmcArrayQueueL2Pad(int capacity) {
 }
 
 abstract class MpmcArrayQueueConsumerField<E> extends MpmcArrayQueueL2Pad<E> {
-    private final static long C_INDEX_OFFSET;
-    static {
-        try {
-            C_INDEX_OFFSET = UNSAFE.objectFieldOffset(MpmcArrayQueueConsumerField.class
-                    .getDeclaredField("consumerIndex"));
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    private final static long C_INDEX_OFFSET = UnsafeAccess.addressOf(MpmcArrayQueueConsumerField.class, "consumerIndex");
     private volatile long consumerIndex;
 
     public MpmcArrayQueueConsumerField(int capacity) {

src/main/java/rx/internal/util/unsafe/MpscLinkedQueue.java

@@ -69,7 +69,7 @@ protected final LinkedQueueNode<E> xchgProducerNode(LinkedQueueNode<E> newVal) {
     @Override
     public final boolean offer(final E nextValue) {
         if (nextValue == null) {
-            throw new IllegalArgumentException("null elements not allowed");
+            throw new NullPointerException("null elements not allowed");
         }
         final LinkedQueueNode<E> nextNode = new LinkedQueueNode<E>(nextValue);
         final LinkedQueueNode<E> prevProducerNode = xchgProducerNode(nextNode);

src/main/java/rx/internal/util/unsafe/SpmcArrayQueue.java

@@ -28,15 +28,7 @@ public SpmcArrayQueueL1Pad(int capacity) {
 }
 
 abstract class SpmcArrayQueueProducerField<E> extends SpmcArrayQueueL1Pad<E> {
-    protected final static long P_INDEX_OFFSET;
-    static {
-        try {
-            P_INDEX_OFFSET =
-                    UNSAFE.objectFieldOffset(SpmcArrayQueueProducerField.class.getDeclaredField("producerIndex"));
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    protected final static long P_INDEX_OFFSET = UnsafeAccess.addressOf(SpmcArrayQueueProducerField.class, "producerIndex");
     private volatile long producerIndex;
 
     protected final long lvProducerIndex() {
@@ -62,15 +54,7 @@ public SpmcArrayQueueL2Pad(int capacity) {
 }
 
 abstract class SpmcArrayQueueConsumerField<E> extends SpmcArrayQueueL2Pad<E> {
-    protected final static long C_INDEX_OFFSET;
-    static {
-        try {
-            C_INDEX_OFFSET =
-                    UNSAFE.objectFieldOffset(SpmcArrayQueueConsumerField.class.getDeclaredField("consumerIndex"));
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    protected final static long C_INDEX_OFFSET = UnsafeAccess.addressOf(SpmcArrayQueueConsumerField.class, "consumerIndex");
     private volatile long consumerIndex;
 
     public SpmcArrayQueueConsumerField(int capacity) {

src/main/java/rx/internal/util/unsafe/SpscArrayQueue.java

@@ -36,15 +36,7 @@ public SpscArrayQueueL1Pad(int capacity) {
 }
 
 abstract class SpscArrayQueueProducerFields<E> extends SpscArrayQueueL1Pad<E> {
-    protected final static long P_INDEX_OFFSET;
-    static {
-        try {
-            P_INDEX_OFFSET =
-                UNSAFE.objectFieldOffset(SpscArrayQueueProducerFields.class.getDeclaredField("producerIndex"));
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    protected final static long P_INDEX_OFFSET = UnsafeAccess.addressOf(SpscArrayQueueProducerFields.class, "producerIndex");
     protected long producerIndex;
     protected long producerLookAhead;
 
@@ -64,15 +56,7 @@ public SpscArrayQueueL2Pad(int capacity) {
 
 abstract class SpscArrayQueueConsumerField<E> extends SpscArrayQueueL2Pad<E> {
     protected long consumerIndex;
-    protected final static long C_INDEX_OFFSET;
-    static {
-        try {
-            C_INDEX_OFFSET =
-                UNSAFE.objectFieldOffset(SpscArrayQueueConsumerField.class.getDeclaredField("consumerIndex"));
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
+    protected final static long C_INDEX_OFFSET = UnsafeAccess.addressOf(SpscArrayQueueConsumerField.class, "consumerIndex");
     public SpscArrayQueueConsumerField(int capacity) {
         super(capacity);
     }
@@ -116,6 +100,9 @@ public SpscArrayQueue(final int capacity) {
      */
     @Override
     public boolean offer(final E e) {
+        if (e == null) {
+            throw new NullPointerException("null elements not allowed");
+        }
         // local load of field to avoid repeated loads after volatile reads
         final E[] lElementBuffer = buffer;
         final long index = producerIndex;

src/main/java/rx/internal/util/unsafe/SpscLinkedQueue.java

@@ -62,7 +62,7 @@ public SpscLinkedQueue() {
     @Override
     public boolean offer(final E nextValue) {
         if (nextValue == null) {
-            throw new IllegalArgumentException("null elements not allowed");
+            throw new NullPointerException("null elements not allowed");
         }
         final LinkedQueueNode<E> nextNode = new LinkedQueueNode<E>(nextValue);
         producerNode.soNext(nextNode);