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/pair.hpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/pair.hpp') diff --git a/src/pair.hpp b/src/pair.hpp index 2cb050a..1ddf50e 100644 --- a/src/pair.hpp +++ b/src/pair.hpp @@ -22,14 +22,12 @@ #define __ZMQ_PAIR_HPP_INCLUDED__ #include "socket_base.hpp" -#include "pipe.hpp" namespace zmq { class pair_t : - public socket_base_t, - public i_pipe_events + public socket_base_t { public: @@ -42,21 +40,14 @@ namespace zmq int xrecv (class msg_t *msg_, int flags_); bool xhas_in (); bool xhas_out (); - - // i_pipe_events interface implementation. - void read_activated (class pipe_t *pipe_); - void write_activated (class pipe_t *pipe_); - void terminated (class pipe_t *pipe_); + void xread_activated (class pipe_t *pipe_); + void xwrite_activated (class pipe_t *pipe_); + void xterminated (class pipe_t *pipe_); private: - // Hook into termination process. - void process_term (int linger_); - class pipe_t *pipe; - bool terminating; - pair_t (const pair_t&); const pair_t &operator = (const pair_t&); }; -- cgit v1.2.3