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/dist.hpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/dist.hpp') diff --git a/src/dist.hpp b/src/dist.hpp index c137332..10613c1 100644 --- a/src/dist.hpp +++ b/src/dist.hpp @@ -35,17 +35,16 @@ namespace zmq { public: - dist_t (class own_t *sink_); + dist_t (); ~dist_t (); void attach (class pipe_t *pipe_); - void terminate (); - int send (class msg_t *msg_, int flags_); - bool has_out (); - void activated (class pipe_t *pipe_); void terminated (class pipe_t *pipe_); + int send (class msg_t *msg_, int flags_); + bool has_out (); + private: // Write the message to the pipe. Make the pipe inactive if writing @@ -74,12 +73,6 @@ namespace zmq // True if last we are in the middle of a multipart message. bool more; - // Object to send events to. - class own_t *sink; - - // If true, termination process is already underway. - bool terminating; - dist_t (const dist_t&); const dist_t &operator = (const dist_t&); }; -- cgit v1.2.3