1 files changed, 76 insertions, 41 deletions

diff --git a/src/xrep.cpp b/src/xrep.cpp
index f50e32e..9cbd9cb 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -23,14 +23,16 @@
 #include "err.hpp"
 #include "pipe.hpp"
 
-zmq::xrep_t::xrep_t (class app_thread_t *parent_) :
-    socket_base_t (parent_),
+zmq::xrep_t::xrep_t (class ctx_t *parent_, uint32_t slot_) :
+    socket_base_t (parent_, slot_),
     current_in (0),
     prefetched (false),
     more_in (false),
     current_out (NULL),
-    more_out (false)
+    more_out (false),
+    terminating (false)
 {
+    options.type = ZMQ_XREP;
     options.requires_in = true;
     options.requires_out = true;
 
@@ -41,42 +43,83 @@ zmq::xrep_t::xrep_t (class app_thread_t *parent_) :
 
 zmq::xrep_t::~xrep_t ()
 {
-    for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end (); it++)
-        it->reader->term ();
-    for (outpipes_t::iterator it = outpipes.begin (); it != outpipes.end ();
-          it++)
-        it->second.writer->term ();
+    zmq_assert (inpipes.empty ());
+    zmq_assert (outpipes.empty ());
 }
 
-void zmq::xrep_t::xattach_pipes (class reader_t *inpipe_,
-    class writer_t *outpipe_, const blob_t &peer_identity_)
+void zmq::xrep_t::xattach_pipes (reader_t *inpipe_, writer_t *outpipe_,
+    const blob_t &peer_identity_)
 {
-    zmq_assert (inpipe_ && outpipe_);
+    if (outpipe_) {
+
+        outpipe_->set_event_sink (this);
+
+        //  TODO: What if new connection has same peer identity as the old one?
+        outpipe_t outpipe = {outpipe_, true};
+        bool ok = outpipes.insert (std::make_pair (
+            peer_identity_, outpipe)).second;
+        zmq_assert (ok);
+
+        if (terminating) {
+            register_term_acks (1);
+            outpipe_->terminate ();        
+        }
+    }
+
+    if (inpipe_) {
+
+        inpipe_->set_event_sink (this);
 
-    //  TODO: What if new connection has same peer identity as the old one?
-    outpipe_t outpipe = {outpipe_, true};
-    bool ok = outpipes.insert (std::make_pair (
-        peer_identity_, outpipe)).second;
-    zmq_assert (ok);
+        inpipe_t inpipe = {inpipe_, peer_identity_, true};
+        inpipes.push_back (inpipe);
 
-    inpipe_t inpipe = {inpipe_, peer_identity_, true};
-    inpipes.push_back (inpipe);
+        if (terminating) {
+            register_term_acks (1);
+            inpipe_->terminate ();
+        }
+    }
 }
 
-void zmq::xrep_t::xdetach_inpipe (class reader_t *pipe_)
+void zmq::xrep_t::process_term ()
+{
+    terminating = true;
+
+    register_term_acks (inpipes.size () + outpipes.size ());
+
+    for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
+          it++)
+        it->reader->terminate ();
+    for (outpipes_t::iterator it = outpipes.begin (); it != outpipes.end ();
+          it++)
+        it->second.writer->terminate ();
+
+    socket_base_t::process_term ();
+}
+
+void zmq::xrep_t::terminated (reader_t *pipe_)
 {
-// TODO:!
     for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
           it++) {
         if (it->reader == pipe_) {
+            if (inpipes [current_in].reader == pipe_) {
+
+                //  A reader is not allowed to terminate in the middle of a
+                //  multipart message.
+                zmq_assert (!prefetched);
+                zmq_assert (!more_in);
+            }
             inpipes.erase (it);
+            if (terminating)
+                unregister_term_ack ();
+            if (current_in >= inpipes.size ())
+                current_in = 0;
             return;
         }
     }
     zmq_assert (false);
 }
 
-void zmq::xrep_t::xdetach_outpipe (class writer_t *pipe_)
+void zmq::xrep_t::terminated (writer_t *pipe_)
 {
     for (outpipes_t::iterator it = outpipes.begin ();
           it != outpipes.end (); ++it) {
@@ -84,26 +127,19 @@ void zmq::xrep_t::xdetach_outpipe (class writer_t *pipe_)
             outpipes.erase (it);
             if (pipe_ == current_out)
                 current_out = NULL;
+            if (terminating)
+                unregister_term_ack ();
             return;
         }
     }
     zmq_assert (false);
 }
 
-void zmq::xrep_t::xkill (class reader_t *pipe_)
+void zmq::xrep_t::delimited (reader_t *pipe_)
 {
-    for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
-          it++) {
-        if (it->reader == pipe_) {
-            zmq_assert (it->active);
-            it->active = false;
-            return;
-        }
-    }
-    zmq_assert (false);
 }
 
-void zmq::xrep_t::xrevive (class reader_t *pipe_)
+void zmq::xrep_t::activated (reader_t *pipe_)
 {
     for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
           it++) {
@@ -116,7 +152,7 @@ void zmq::xrep_t::xrevive (class reader_t *pipe_)
     zmq_assert (false);
 }
 
-void zmq::xrep_t::xrevive (class writer_t *pipe_)
+void zmq::xrep_t::activated (writer_t *pipe_)
 {
     for (outpipes_t::iterator it = outpipes.begin ();
           it != outpipes.end (); ++it) {
@@ -129,13 +165,6 @@ void zmq::xrep_t::xrevive (class writer_t *pipe_)
     zmq_assert (false);
 }
 
-int zmq::xrep_t::xsetsockopt (int option_, const void *optval_,
-    size_t optvallen_)
-{
-    errno = EINVAL;
-    return -1;
-}
-
 int zmq::xrep_t::xsend (zmq_msg_t *msg_, int flags_)
 {
     //  If this is the first part of the message it's the identity of the
@@ -233,7 +262,9 @@ int zmq::xrep_t::xrecv (zmq_msg_t *msg_, int flags_)
             return 0;
         }
 
-        //  If me don't have a message, move to next pipe.
+        //  If me don't have a message, mark the pipe as passive and
+        //  move to next pipe.
+        inpipes [current_in].active = false;
         current_in++;
         if (current_in >= inpipes.size ())
             current_in = 0;
@@ -260,6 +291,10 @@ bool zmq::xrep_t::xhas_in ()
         if (inpipes [current_in].active &&
               inpipes [current_in].reader->check_read ())
             return true;
+
+        //  If me don't have a message, mark the pipe as passive and
+        //  move to next pipe.
+        inpipes [current_in].active = false;
         current_in++;
         if (current_in >= inpipes.size ())
             current_in = 0;