Move the pipe termination code to socket_base_t

So far, the pipe termination code was spread among socket type
classes, fair queuer, load balancer, etc. This patch moves
all the associated logic to a single place.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 4 insertions, 17 deletions

diff --git a/src/pull.cpp b/src/pull.cpp
index 66457b8..5e48777 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -21,10 +21,10 @@
 #include "pull.hpp"
 #include "err.hpp"
 #include "msg.hpp"
+#include "pipe.hpp"
 
 zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t tid_) :
-    socket_base_t (parent_, tid_),
-    fq (this)
+    socket_base_t (parent_, tid_)
 {
     options.type = ZMQ_PULL;
 }
@@ -36,32 +36,19 @@ zmq::pull_t::~pull_t ()
 void zmq::pull_t::xattach_pipe (pipe_t *pipe_, const blob_t &peer_identity_)
 {
     zmq_assert (pipe_);
-    pipe_->set_event_sink (this);
     fq.attach (pipe_);
 }
 
-void zmq::pull_t::read_activated (pipe_t *pipe_)
+void zmq::pull_t::xread_activated (pipe_t *pipe_)
 {
     fq.activated (pipe_);
 }
 
-void zmq::pull_t::write_activated (pipe_t *pipe_)
-{
-    //  There are no outbound messages in pull socket. This should never happen.
-    zmq_assert (false);
-}
-
-void zmq::pull_t::terminated (pipe_t *pipe_)
+void zmq::pull_t::xterminated (pipe_t *pipe_)
 {
     fq.terminated (pipe_);
 }
 
-void zmq::pull_t::process_term (int linger_)
-{
-    fq.terminate ();
-    socket_base_t::process_term (linger_);
-}
-
 int zmq::pull_t::xrecv (msg_t *msg_, int flags_)
 {
     return fq.recv (msg_, flags_);