From 8eae7d8507b1c96aec28bca20a157bb7537c3eb8 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Fri, 14 Jan 2011 12:05:10 +0100
Subject: 'message distribution mechanism' separated from XPUB socket

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
---
 src/xpub.cpp | 119 +++--------------------------------------------------------
 1 file changed, 6 insertions(+), 113 deletions(-)

(limited to 'src/xpub.cpp')

diff --git a/src/xpub.cpp b/src/xpub.cpp
index 601ec23..ed9c0e5 100644
--- a/src/xpub.cpp
+++ b/src/xpub.cpp
@@ -21,13 +21,11 @@
 
 #include "xpub.hpp"
 #include "err.hpp"
-#include "msg_content.hpp"
 #include "pipe.hpp"
 
 zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_) :
     socket_base_t (parent_, tid_),
-    active (0),
-    terminating (false)
+    dist (this)
 {
     options.type = ZMQ_XPUB;
     options.requires_in = false;
@@ -36,136 +34,31 @@ zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_) :
 
 zmq::xpub_t::~xpub_t ()
 {
-    zmq_assert (pipes.empty ());
 }
 
 void zmq::xpub_t::xattach_pipes (class reader_t *inpipe_,
     class writer_t *outpipe_, const blob_t &peer_identity_)
 {
     zmq_assert (!inpipe_);
-
-    outpipe_->set_event_sink (this);
-
-    pipes.push_back (outpipe_);
-    pipes.swap (active, pipes.size () - 1);
-    active++;
-
-    if (terminating) {
-        register_term_acks (1);
-        outpipe_->terminate ();
-    }
+    dist.attach (outpipe_);
 }
 
 void zmq::xpub_t::process_term (int linger_)
 {
-    terminating = true;
-
-    //  Start shutdown process for all the pipes.
-    for (pipes_t::size_type i = 0; i != pipes.size (); i++)
-        pipes [i]->terminate ();
-
-    //  Wait for pipes to terminate before terminating yourself.
-    register_term_acks (pipes.size ());
+    //  Terminate the outbound pipes.
+    dist.terminate ();
 
     //  Continue with the termination immediately.
     socket_base_t::process_term (linger_);
 }
 
-void zmq::xpub_t::activated (writer_t *pipe_)
-{
-    //  Move the pipe to the list of active pipes.
-    pipes.swap (pipes.index (pipe_), active);
-    active++;
-}
-
-void zmq::xpub_t::terminated (writer_t *pipe_)
-{
-    //  Remove the pipe from the list; adjust number of active pipes
-    //  accordingly.
-    if (pipes.index (pipe_) < active)
-        active--;
-    pipes.erase (pipe_);
-
-    //  If we are already terminating, wait for one term ack less.
-    if (terminating)
-        unregister_term_ack ();
-}
-
 int zmq::xpub_t::xsend (zmq_msg_t *msg_, int flags_)
 {
-    //  If there are no active pipes available, simply drop the message.
-    if (active == 0) {
-        int rc = zmq_msg_close (msg_);
-        zmq_assert (rc == 0);
-        rc = zmq_msg_init (msg_);
-        zmq_assert (rc == 0);
-        return 0;
-    }
-
-    msg_content_t *content = (msg_content_t*) msg_->content;
-
-    //  For VSMs the copying is straighforward.
-    if (content == (msg_content_t*) ZMQ_VSM) {
-        for (pipes_t::size_type i = 0; i < active;)
-            if (write (pipes [i], msg_))
-                i++;
-        int rc = zmq_msg_init (msg_);
-        zmq_assert (rc == 0);
-        return 0;
-    }
-
-    //  Optimisation for the case when there's only a single pipe
-    //  to send the message to - no refcount adjustment i.e. no atomic
-    //  operations are needed.
-    if (active == 1) {
-        if (!write (pipes [0], msg_)) {
-            int rc = zmq_msg_close (msg_);
-            zmq_assert (rc == 0);
-        }
-        int rc = zmq_msg_init (msg_);
-        zmq_assert (rc == 0);
-        return 0;
-    }
-
-    //  There are at least 2 destinations for the message. That means we have
-    //  to deal with reference counting. First add N-1 references to
-    //  the content (we are holding one reference anyway, that's why -1).
-    if (msg_->flags & ZMQ_MSG_SHARED)
-        content->refcnt.add (active - 1);
-    else {
-        content->refcnt.set (active);
-        msg_->flags |= ZMQ_MSG_SHARED;
-    }
-
-    //  Push the message to all destinations.
-    for (pipes_t::size_type i = 0; i < active;) {
-        if (!write (pipes [i], msg_))
-            content->refcnt.sub (1);
-        else
-            i++;
-    }
-
-    //  Detach the original message from the data buffer.
-    int rc = zmq_msg_init (msg_);
-    zmq_assert (rc == 0);
-
-    return 0;
+    return dist.send (msg_, flags_);
 }
 
 bool zmq::xpub_t::xhas_out ()
 {
-    return true;
-}
-
-bool zmq::xpub_t::write (class writer_t *pipe_, zmq_msg_t *msg_)
-{
-    if (!pipe_->write (msg_)) {
-        active--;
-        pipes.swap (pipes.index (pipe_), active);
-        return false;
-    }
-    if (!(msg_->flags & ZMQ_MSG_MORE))
-        pipe_->flush ();
-    return true;
+    return dist.has_out ();
 }
 
-- 
cgit v1.2.3