Merge pull request #1 from robertroeser/master

updated to use use reactivesocket 0.0.5, and added ability to schedul…

Author: rdegnan

build.gradle

@@ -16,7 +16,7 @@ subprojects {
     dependencies {
         compile 'io.reactivex:rxjava:1.1.2'
         compile 'io.reactivex:rxjava-reactive-streams:1.0.1'
-        compile 'io.reactivesocket:reactivesocket:0.0.4'
+        compile 'io.reactivesocket:reactivesocket:0.0.5'
         compile 'org.hdrhistogram:HdrHistogram:2.1.7'
         compile 'org.slf4j:slf4j-api:1.7.12'
         testCompile 'junit:junit:4.12'

reactivesocket-aeron/build.gradle

@@ -1,4 +1,3 @@
 dependencies {
-    compile 'uk.co.real-logic:Agrona:0.4.8'
-    compile 'uk.co.real-logic:aeron-all:0.2.2'
+    compile 'io.aeron:aeron-all:0.9.5'
 }

reactivesocket-aeron/src/examples/java/io/reactivesocket/aeron/example/MediaDriver.java

@@ -15,9 +15,8 @@
  */
 package io.reactivesocket.aeron.example;
 
-import uk.co.real_logic.aeron.driver.ThreadingMode;
-import uk.co.real_logic.agrona.concurrent.BackoffIdleStrategy;
-import uk.co.real_logic.agrona.concurrent.NoOpIdleStrategy;
+import io.aeron.driver.ThreadingMode;
+import org.agrona.concurrent.BackoffIdleStrategy;
 
 public class MediaDriver {
     public static void main(String... args) {
@@ -31,14 +30,14 @@ public static void main(String... args) {
 
         System.out.println("ThreadingMode => " + threadingMode);
 
-        final uk.co.real_logic.aeron.driver.MediaDriver.Context ctx = new uk.co.real_logic.aeron.driver.MediaDriver.Context()
+        final io.aeron.driver.MediaDriver.Context ctx = new io.aeron.driver.MediaDriver.Context()
                 .threadingMode(threadingMode)
                 .dirsDeleteOnStart(true)
                 .conductorIdleStrategy(new BackoffIdleStrategy(1, 1, 100, 1000))
-                .receiverIdleStrategy(new NoOpIdleStrategy())
-                .senderIdleStrategy(new NoOpIdleStrategy());
+                .receiverIdleStrategy(new BackoffIdleStrategy(1, 1, 100, 1000))
+                .senderIdleStrategy(new BackoffIdleStrategy(1, 1, 100, 1000));
 
-        final uk.co.real_logic.aeron.driver.MediaDriver ignored = uk.co.real_logic.aeron.driver.MediaDriver.launch(ctx);
+        final io.aeron.driver.MediaDriver ignored = io.aeron.driver.MediaDriver.launch(ctx);
 
     }
 }

reactivesocket-aeron/src/examples/java/io/reactivesocket/aeron/example/fireandforget/Fire.java

@@ -17,6 +17,7 @@
 
 
 import io.reactivesocket.ConnectionSetupPayload;
+import io.reactivesocket.DefaultReactiveSocket;
 import io.reactivesocket.Payload;
 import io.reactivesocket.ReactiveSocket;
 import io.reactivesocket.aeron.client.AeronClientDuplexConnection;
@@ -61,7 +62,7 @@ public static void main(String... args) throws Exception {
         AeronClientDuplexConnection connection = RxReactiveStreams.toObservable(udpConnection).toBlocking().single();
         System.out.println("Created duplex connection");
 
-        ReactiveSocket reactiveSocket = ReactiveSocket.fromClientConnection(connection, ConnectionSetupPayload.create("UTF-8", "UTF-8", ConnectionSetupPayload.NO_FLAGS));
+        ReactiveSocket reactiveSocket = DefaultReactiveSocket.fromClientConnection(connection, ConnectionSetupPayload.create("UTF-8", "UTF-8", ConnectionSetupPayload.NO_FLAGS));
         reactiveSocket.startAndWait();
 
         CountDownLatch latch = new CountDownLatch(Integer.MAX_VALUE);

reactivesocket-aeron/src/examples/java/io/reactivesocket/aeron/example/requestreply/Ping.java

@@ -16,6 +16,7 @@
 package io.reactivesocket.aeron.example.requestreply;
 
 import io.reactivesocket.ConnectionSetupPayload;
+import io.reactivesocket.DefaultReactiveSocket;
 import io.reactivesocket.Payload;
 import io.reactivesocket.ReactiveSocket;
 import io.reactivesocket.aeron.client.AeronClientDuplexConnection;
@@ -63,7 +64,7 @@ public static void main(String... args) throws Exception {
         AeronClientDuplexConnection connection = RxReactiveStreams.toObservable(udpConnection).toBlocking().single();
         System.out.println("Created duplex connection");
 
-        ReactiveSocket reactiveSocket = ReactiveSocket.fromClientConnection(connection, ConnectionSetupPayload.create("UTF-8", "UTF-8", ConnectionSetupPayload.NO_FLAGS));
+        ReactiveSocket reactiveSocket = DefaultReactiveSocket.fromClientConnection(connection, ConnectionSetupPayload.create("UTF-8", "UTF-8", ConnectionSetupPayload.NO_FLAGS));
         reactiveSocket.startAndWait();
 
         CountDownLatch latch = new CountDownLatch(Integer.MAX_VALUE);
@@ -83,7 +84,7 @@ public static void main(String... args) throws Exception {
                 System.out.println("---- PING/ PONG HISTO ----");
 
 
-            }, 10, 10, TimeUnit.SECONDS);
+            }, 1, 1, TimeUnit.SECONDS);
 
         Observable
             .range(1, Integer.MAX_VALUE)
@@ -112,7 +113,7 @@ public ByteBuffer getMetadata() {
                         long diff = System.nanoTime() - start;
                         histogram.recordValue(diff);
                     });
-            })
+            }, 16)
             .subscribe(new Subscriber<Payload>() {
                 @Override
                 public void onCompleted() {

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/AeronClientDuplexConnection.java

@@ -15,18 +15,18 @@
  */
 package io.reactivesocket.aeron.client;
 
+import io.aeron.Publication;
 import io.reactivesocket.DuplexConnection;
 import io.reactivesocket.Frame;
 import io.reactivesocket.aeron.internal.Loggable;
 import io.reactivesocket.rx.Completable;
 import io.reactivesocket.rx.Disposable;
 import io.reactivesocket.rx.Observable;
 import io.reactivesocket.rx.Observer;
+import org.agrona.concurrent.AbstractConcurrentArrayQueue;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
-import uk.co.real_logic.aeron.Publication;
-import uk.co.real_logic.agrona.concurrent.AbstractConcurrentArrayQueue;
 
 import java.io.IOException;
 import java.util.concurrent.CopyOnWriteArrayList;

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/AeronClientDuplexConnectionFactory.java

@@ -23,13 +23,13 @@
 import io.reactivesocket.rx.Observer;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
-import uk.co.real_logic.aeron.Publication;
-import uk.co.real_logic.aeron.logbuffer.FragmentHandler;
-import uk.co.real_logic.aeron.logbuffer.Header;
-import uk.co.real_logic.agrona.BitUtil;
-import uk.co.real_logic.agrona.DirectBuffer;
-import uk.co.real_logic.agrona.concurrent.ManyToManyConcurrentArrayQueue;
-import uk.co.real_logic.agrona.concurrent.UnsafeBuffer;
+import io.aeron.Publication;
+import io.aeron.logbuffer.FragmentHandler;
+import io.aeron.logbuffer.Header;
+import org.agrona.BitUtil;
+import org.agrona.DirectBuffer;
+import org.agrona.concurrent.ManyToManyConcurrentArrayQueue;
+import org.agrona.concurrent.UnsafeBuffer;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/AeronReactiveSocketFactory.java

@@ -1,27 +1,32 @@
 package io.reactivesocket.aeron.client;
 
 import io.reactivesocket.ConnectionSetupPayload;
+import io.reactivesocket.DefaultReactiveSocket;
 import io.reactivesocket.ReactiveSocket;
 import io.reactivesocket.ReactiveSocketFactory;
+import io.reactivesocket.ReactiveSocketSocketAddressFactory;
 import io.reactivesocket.rx.Completable;
+import org.agrona.LangUtil;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import rx.Observable;
 import rx.RxReactiveStreams;
-import uk.co.real_logic.agrona.LangUtil;
 
-import java.net.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.SocketAddress;
 import java.util.Enumeration;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 /**
  * An implementation of {@link ReactiveSocketFactory} that creates Aeron ReactiveSockets.
  */
-public class AeronReactiveSocketFactory implements ReactiveSocketFactory {
+public class AeronReactiveSocketFactory implements ReactiveSocketSocketAddressFactory<ReactiveSocket> {
     private static final Logger logger = LoggerFactory.getLogger(AeronReactiveSocketFactory.class);
 
     private final ConnectionSetupPayload connectionSetupPayload;
@@ -46,7 +51,7 @@ public AeronReactiveSocketFactory(String host, int port, ConnectionSetupPayload
     }
 
     @Override
-    public Publisher<ReactiveSocket> call(SocketAddress address, long timeout, TimeUnit timeUnit) {
+    public Publisher<ReactiveSocket> call(SocketAddress address) {
         Publisher<AeronClientDuplexConnection> connection
             = AeronClientDuplexConnectionFactory.getInstance().createAeronClientDuplexConnection(address);
 
@@ -59,7 +64,7 @@ public void onSubscribe(Subscription s) {
 
                 @Override
                 public void onNext(AeronClientDuplexConnection connection) {
-                    ReactiveSocket reactiveSocket = ReactiveSocket.fromClientConnection(connection, connectionSetupPayload, errorStream);
+                    ReactiveSocket reactiveSocket = DefaultReactiveSocket.fromClientConnection(connection, connectionSetupPayload, errorStream);
                     reactiveSocket.start(new Completable() {
                         @Override
                         public void success() {
@@ -85,7 +90,7 @@ public void onComplete() {
             })
         );
 
-        return RxReactiveStreams.toPublisher(result.timeout(timeout, timeUnit));
+        return RxReactiveStreams.toPublisher(result);
     }
 
     private static InetAddress getIPv4InetAddress() {

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/ClientAeronManager.java

@@ -18,11 +18,11 @@
 import io.reactivesocket.aeron.internal.Loggable;
 import rx.Scheduler;
 import rx.schedulers.Schedulers;
-import uk.co.real_logic.aeron.Aeron;
-import uk.co.real_logic.aeron.FragmentAssembler;
-import uk.co.real_logic.aeron.Image;
-import uk.co.real_logic.aeron.Subscription;
-import uk.co.real_logic.aeron.logbuffer.FragmentHandler;
+import io.aeron.Aeron;
+import io.aeron.FragmentAssembler;
+import io.aeron.Image;
+import io.aeron.Subscription;
+import io.aeron.logbuffer.FragmentHandler;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
@@ -47,8 +47,8 @@ private ClientAeronManager() {
 
         final Aeron.Context ctx = new Aeron.Context();
         ctx.errorHandler(t -> error("an exception occurred", t));
-        ctx.availableImageHandler((Image image, Subscription subscription, long joiningPosition, String sourceIdentity) ->
-            debug("New image available with session id => {} and sourceIdentity  => {} and subscription => {}", image.sessionId(), sourceIdentity, subscription.toString())
+        ctx.availableImageHandler((Image image) ->
+            debug("New image available with session id => {} and sourceIdentity  => {} and subscription => {}", image.sessionId(), image.sourceIdentity(), image.subscription().toString())
         );
 
         aeron = Aeron.connect(ctx);
@@ -117,7 +117,7 @@ void poll() {
      */
 
     /**
-     * Creates a logic group of {@link uk.co.real_logic.aeron.Subscription}s to a particular channel.
+     * Creates a logic group of {@link io.aeron.Subscription}s to a particular channel.
      */
     public static class SubscriptionGroup {
 

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/FrameHolder.java

@@ -15,15 +15,14 @@
  */
 package io.reactivesocket.aeron.client;
 
+import io.aeron.Publication;
 import io.reactivesocket.Frame;
 import org.HdrHistogram.Recorder;
+import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
 import org.reactivestreams.Subscription;
-import uk.co.real_logic.aeron.Publication;
-import uk.co.real_logic.agrona.concurrent.OneToOneConcurrentArrayQueue;
-
 /**
  * Holds a frame and the publication that it's supposed to be sent on.
- * Pools instances on an {@link uk.co.real_logic.agrona.concurrent.OneToOneConcurrentArrayQueue}
+ * Pools instances on an {@link OneToOneConcurrentArrayQueue}
  */
 public class FrameHolder {
     private static final ThreadLocal<OneToOneConcurrentArrayQueue<FrameHolder>> FRAME_HOLDER_QUEUE

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/client/PollingAction.java

@@ -15,9 +15,9 @@
  */
 package io.reactivesocket.aeron.client;
 
+import io.aeron.Subscription;
 import io.reactivesocket.aeron.internal.Loggable;
 import rx.functions.Action0;
-import uk.co.real_logic.aeron.Subscription;
 
 import java.util.List;
 

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/internal/AeronUtil.java

@@ -15,11 +15,11 @@
  */
 package io.reactivesocket.aeron.internal;
 
-import uk.co.real_logic.aeron.Publication;
-import uk.co.real_logic.aeron.logbuffer.BufferClaim;
-import uk.co.real_logic.agrona.MutableDirectBuffer;
-import uk.co.real_logic.agrona.concurrent.OneToOneConcurrentArrayQueue;
-import uk.co.real_logic.agrona.concurrent.UnsafeBuffer;
+import io.aeron.Publication;
+import io.aeron.logbuffer.BufferClaim;
+import org.agrona.MutableDirectBuffer;
+import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
+import org.agrona.concurrent.UnsafeBuffer;
 
 import java.util.concurrent.TimeUnit;
 
@@ -41,7 +41,7 @@ public class AeronUtil implements Loggable {
      * This method of sending data does need to know how long the message is.
      *
      * @param publication publication to send the message on
-     * @param fillBuffer  closure passed in to fill a {@link uk.co.real_logic.agrona.MutableDirectBuffer}
+     * @param fillBuffer  closure passed in to fill a {@link MutableDirectBuffer}
      *                    that is send over Aeron
      */
     public static void offer(Publication publication, BufferFiller fillBuffer, int length, int timeout, TimeUnit timeUnit) {
@@ -76,7 +76,7 @@ public static void offer(Publication publication, BufferFiller fillBuffer, int l
      * In order to use this method of sending data you need to know the length of data.
      *
      * @param publication publication to send the message on
-     * @param fillBuffer  closure passed in to fill a {@link uk.co.real_logic.agrona.MutableDirectBuffer}
+     * @param fillBuffer  closure passed in to fill a {@link MutableDirectBuffer}
      *                    that is send over Aeron
      * @param length      the length of data
      */
@@ -114,7 +114,7 @@ public static void tryClaim(Publication publication, BufferFiller fillBuffer, in
      * size it will use offer instead.
      *
      * @param publication publication to send the message on
-     * @param fillBuffer  closure passed in to fill a {@link uk.co.real_logic.agrona.MutableDirectBuffer}
+     * @param fillBuffer  closure passed in to fill a {@link MutableDirectBuffer}
      *                    that is send over Aeron
      * @param length      the length of data
      */

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/internal/Constants.java

@@ -15,10 +15,11 @@
  */
 package io.reactivesocket.aeron.internal;
 
-import uk.co.real_logic.agrona.concurrent.BackoffIdleStrategy;
-import uk.co.real_logic.agrona.concurrent.IdleStrategy;
-import uk.co.real_logic.agrona.concurrent.NoOpIdleStrategy;
-import uk.co.real_logic.agrona.concurrent.SleepingIdleStrategy;
+
+import org.agrona.concurrent.BackoffIdleStrategy;
+import org.agrona.concurrent.IdleStrategy;
+import org.agrona.concurrent.NoOpIdleStrategy;
+import org.agrona.concurrent.SleepingIdleStrategy;
 
 import java.util.concurrent.TimeUnit;
 

reactivesocket-aeron/src/main/java/io/reactivesocket/aeron/server/AeronServerDuplexConnection.java

@@ -15,16 +15,20 @@
  */
 package io.reactivesocket.aeron.server;
 
+import io.aeron.Publication;
 import io.reactivesocket.DuplexConnection;
 import io.reactivesocket.Frame;
-import io.reactivesocket.aeron.internal.*;
+import io.reactivesocket.aeron.internal.AeronUtil;
+import io.reactivesocket.aeron.internal.Constants;
+import io.reactivesocket.aeron.internal.Loggable;
+import io.reactivesocket.aeron.internal.MessageType;
+import io.reactivesocket.aeron.internal.NotConnectedException;
 import io.reactivesocket.rx.Completable;
 import io.reactivesocket.rx.Disposable;
 import io.reactivesocket.rx.Observable;
 import io.reactivesocket.rx.Observer;
+import org.agrona.BitUtil;
 import org.reactivestreams.Publisher;
-import uk.co.real_logic.aeron.Publication;
-import uk.co.real_logic.agrona.BitUtil;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;