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

diff --git a/src/xrep.hpp b/src/xrep.hpp
index d0378c2..fbc7385 100644
--- a/src/xrep.hpp
+++ b/src/xrep.hpp
@@ -26,7 +26,6 @@
 
 #include "socket_base.hpp"
 #include "blob.hpp"
-#include "pipe.hpp"
 #include "msg.hpp"
 
 namespace zmq
@@ -34,8 +33,7 @@ namespace zmq
 
     //  TODO: This class uses O(n) scheduling. Rewrite it to use O(1) algorithm.
     class xrep_t :
-        public socket_base_t,
-        public i_pipe_events
+        public socket_base_t
     {
     public:
 
@@ -48,6 +46,9 @@ 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_);
 
     protected:
 
@@ -56,14 +57,6 @@ namespace zmq
 
     private:
 
-        //  Hook into the termination process.
-        void process_term (int linger_);
-
-        //  i_pipe_events interface implementation.
-        void read_activated (pipe_t *pipe_);
-        void write_activated (pipe_t *pipe_);
-        void terminated (pipe_t *pipe_);
-
         struct inpipe_t
         {
             class pipe_t *pipe;
@@ -103,9 +96,6 @@ namespace zmq
         //  If true, more outgoing message parts are expected.
         bool more_out;
 
-        //  If true, termination process is already underway.
-        bool terminating;
-
         xrep_t (const xrep_t&);
         const xrep_t &operator = (const xrep_t&);
     };