From ac4e396f5d7a96a93cc7871e5babb157aac19b56 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Fri, 1 May 2015 00:40:28 +0200
Subject: [PATCH] renamed queue

---
 .../util/messagebus/common/simpleq/SimpleQueue.java      | 9 +++++----
 .../MpmcArrayTransferQueue.java}                         | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename src/main/java/dorkbox/util/messagebus/common/simpleq/{MpmcExchangerQueue.java => jctools/MpmcArrayTransferQueue.java} (98%)

diff --git a/src/main/java/dorkbox/util/messagebus/common/simpleq/SimpleQueue.java b/src/main/java/dorkbox/util/messagebus/common/simpleq/SimpleQueue.java
index 17e6c04..5c7b334 100644
--- a/src/main/java/dorkbox/util/messagebus/common/simpleq/SimpleQueue.java
+++ b/src/main/java/dorkbox/util/messagebus/common/simpleq/SimpleQueue.java
@@ -2,6 +2,7 @@ package dorkbox.util.messagebus.common.simpleq;
 
 import java.util.concurrent.TimeUnit;
 
+import dorkbox.util.messagebus.common.simpleq.jctools.MpmcArrayTransferQueue;
 import dorkbox.util.messagebus.common.simpleq.jctools.Pow2;
 
 public final class SimpleQueue {
@@ -41,17 +42,17 @@ public final class SimpleQueue {
      */
     static final long spinForTimeoutThreshold = 1000L;
 
-    private MpmcExchangerQueue queue;
+    private MpmcArrayTransferQueue queue;
 
     public SimpleQueue(final int size) {
-        this.queue = new MpmcExchangerQueue(Pow2.roundToPowerOfTwo(size));
+        this.queue = new MpmcArrayTransferQueue(Pow2.roundToPowerOfTwo(size));
     }
 
     /**
      * PRODUCER
      */
     public void put(Object item) throws InterruptedException {
-        this.queue.xfer(item, false, 0, MpmcExchangerQueue.TYPE_PRODUCER);
+        this.queue.xfer(item, false, 0, MpmcArrayTransferQueue.TYPE_PRODUCER);
     }
 
 
@@ -61,7 +62,7 @@ public final class SimpleQueue {
     public Object take() throws InterruptedException {
 //        this.queue.xfer(123, false, 0, MpmcExchangerQueue.TYPE_PRODUCER);
 //        return 123;
-        return this.queue.xfer(null, false, 0, MpmcExchangerQueue.TYPE_CONSUMER);
+        return this.queue.xfer(null, false, 0, MpmcArrayTransferQueue.TYPE_CONSUMER);
     }
 
     private Object xfer(Object item, boolean timed, long nanos, byte incomingType) throws InterruptedException {
diff --git a/src/main/java/dorkbox/util/messagebus/common/simpleq/MpmcExchangerQueue.java b/src/main/java/dorkbox/util/messagebus/common/simpleq/jctools/MpmcArrayTransferQueue.java
similarity index 98%
rename from src/main/java/dorkbox/util/messagebus/common/simpleq/MpmcExchangerQueue.java
rename to src/main/java/dorkbox/util/messagebus/common/simpleq/jctools/MpmcArrayTransferQueue.java
index 7f34856..86bf5b8 100644
--- a/src/main/java/dorkbox/util/messagebus/common/simpleq/MpmcExchangerQueue.java
+++ b/src/main/java/dorkbox/util/messagebus/common/simpleq/jctools/MpmcArrayTransferQueue.java
@@ -1,13 +1,13 @@
-package dorkbox.util.messagebus.common.simpleq;
+package dorkbox.util.messagebus.common.simpleq.jctools;
 
 import static dorkbox.util.messagebus.common.simpleq.jctools.UnsafeAccess.UNSAFE;
 
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.locks.LockSupport;
 
-import dorkbox.util.messagebus.common.simpleq.jctools.MpmcArrayQueueConsumerField;
+import dorkbox.util.messagebus.common.simpleq.Node;
 
-public final class MpmcExchangerQueue extends MpmcArrayQueueConsumerField<Node> {
+public final class MpmcArrayTransferQueue extends MpmcArrayQueueConsumerField<Node> {
 
     public static final int TYPE_FREE = 0;
     public static final int TYPE_CONSUMER = 1;
@@ -84,7 +84,7 @@ public final class MpmcExchangerQueue extends MpmcArrayQueueConsumerField<Node>
     long p30, p31, p32, p33, p34, p35, p36, p37;
 
     /** Creates a {@code EliminationStack} that is initially empty. */
-    public MpmcExchangerQueue(final int size) {
+    public MpmcArrayTransferQueue(final int size) {
         super(size);
 
         // pre-fill our data structures