From 0f6f7276e32c01ccfe86fb76741a52ac6ffc87af Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 23 May 2011 20:30:01 +0200 Subject: 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 --- src/xsub.hpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/xsub.hpp') diff --git a/src/xsub.hpp b/src/xsub.hpp index ed9c462..58ddae5 100644 --- a/src/xsub.hpp +++ b/src/xsub.hpp @@ -23,7 +23,6 @@ #include "trie.hpp" #include "socket_base.hpp" -#include "pipe.hpp" #include "msg.hpp" #include "fq.hpp" @@ -31,8 +30,7 @@ namespace zmq { class xsub_t : - public socket_base_t, - public i_pipe_events + public socket_base_t { public: @@ -47,17 +45,11 @@ namespace zmq bool xhas_out (); int xrecv (class msg_t *msg_, int flags_); bool xhas_in (); + void xread_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_); - // Check whether the message matches at least one subscription. bool match (class msg_t *msg_); -- cgit v1.2.3