[Java] Allow spy subscriptions to be one-to-many for different sessio…

…ns and simplify unlinking code.
aeron-io · Mar 2, 2017 · 8001590 · 8001590
1 parent 7f9d0f6
commit 8001590
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 38 deletions.
diff --git a/aeron-driver/src/main/java/io/aeron/driver/DriverConductor.java b/aeron-driver/src/main/java/io/aeron/driver/DriverConductor.java
@@ -352,11 +352,7 @@ void cleanupPublication(final NetworkPublication publication)
 
             for (int i = 0, size = subscriptionLinks.size(); i < size; i++)
             {
-                final SubscriptionLink subscription = subscriptionLinks.get(i);
-                if (subscription.matches(publication))
-                {
-                    subscription.unlink(publication);
-                }
+                subscriptionLinks.get(i).unlink(publication);
             }
         }
 
@@ -408,23 +404,15 @@ void cleanupImage(final PublicationImage image)
     {
         for (int i = 0, size = subscriptionLinks.size(); i < size; i++)
         {
-            final SubscriptionLink subscription = subscriptionLinks.get(i);
-            if (image.matches(subscription.channelEndpoint(), subscription.streamId()))
-            {
-                subscription.unlink(image);
-            }
+            subscriptionLinks.get(i).unlink(image);
         }
     }
 
     void cleanupIpcPublication(final IpcPublication publication)
     {
         for (int i = 0, size = subscriptionLinks.size(); i < size; i++)
         {
-            final SubscriptionLink subscription = subscriptionLinks.get(i);
-            if (subscription.matches(publication.streamId()))
-            {
-                subscription.unlink(publication);
-            }
+            subscriptionLinks.get(i).unlink(publication);
         }
     }
 
@@ -1102,7 +1090,7 @@ private void linkSpies(final NetworkPublication publication)
         for (int i = 0, size = links.size(); i < size; i++)
         {
             final SubscriptionLink subscription = links.get(i);
-            if (subscription.matches(publication))
+            if (subscription.matches(publication) && !subscription.isLinked(publication))
             {
                 linkSpy(publication, subscription);
             }

diff --git a/aeron-driver/src/main/java/io/aeron/driver/SubscriptionLink.java b/aeron-driver/src/main/java/io/aeron/driver/SubscriptionLink.java
@@ -197,8 +197,6 @@ public boolean matches(final int streamId)
 class SpySubscriptionLink extends SubscriptionLink
 {
     private final UdpChannel udpChannel;
-    private NetworkPublication publication = null;
-    private ReadablePosition position = null;
 
     SpySubscriptionLink(
         final long registrationId,
@@ -211,29 +209,9 @@ class SpySubscriptionLink extends SubscriptionLink
         this.udpChannel = spiedChannel;
     }
 
-    public void link(final Subscribable subscribable, final ReadablePosition position)
-    {
-        this.publication = (NetworkPublication)subscribable;
-        this.position = position;
-    }
-
-    public void unlink(final Subscribable subscribable)
-    {
-        publication = null;
-        position = null;
-    }
-
     public boolean matches(final NetworkPublication publication)
     {
         return streamId == publication.streamId() &&
             udpChannel.canonicalForm().equals(publication.sendChannelEndpoint().udpChannel().canonicalForm());
     }
-
-    public void close()
-    {
-        if (null != publication)
-        {
-            publication.removeSubscriber(position);
-        }
-    }
 }