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, 11 deletions

diff --git a/src/xreq.hpp b/src/xreq.hpp
index a75e5c8..5bf1a03 100644
--- a/src/xreq.hpp
+++ b/src/xreq.hpp
@@ -23,7 +23,6 @@
 #define __ZMQ_XREQ_HPP_INCLUDED__
 
 #include "socket_base.hpp"
-#include "pipe.hpp"
 #include "fq.hpp"
 #include "lb.hpp"
 
@@ -31,8 +30,7 @@ namespace zmq
 {
 
     class xreq_t :
-        public socket_base_t,
-        public i_pipe_events
+        public socket_base_t
     {
     public:
 
@@ -47,17 +45,12 @@ namespace zmq
         int xrecv (class msg_t *msg_, int flags_);
         bool xhas_in ();
         bool xhas_out ();
+        void xread_activated (class pipe_t *pipe_);
+        void xwrite_activated (class pipe_t *pipe_);
+        void xterminated (class pipe_t *pipe_);
 
     private:
 
-        //  i_pipe_events interface implementation.
-        void read_activated (pipe_t *pipe_);
-        void write_activated (pipe_t *pipe_);
-        void terminated (pipe_t *pipe_);
-
-        //  Hook into the termination process.
-        void process_term (int linger_);
-
         //  Messages are fair-queued from inbound pipes. And load-balanced to
         //  the outbound pipes.
         fq_t fq;