diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-05-23 20:30:01 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-05-23 20:30:01 +0200 |
commit | 0f6f7276e32c01ccfe86fb76741a52ac6ffc87af (patch) | |
tree | 3f2cec589f6243742da7e79028633d35f8b362db /src/dist.cpp | |
parent | acf0b0e515515e51ad32ba7a2d147ce703579478 (diff) |
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>
Diffstat (limited to 'src/dist.cpp')
-rw-r--r-- | src/dist.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/dist.cpp b/src/dist.cpp index 3afa196..f7f0488 100644 --- a/src/dist.cpp +++ b/src/dist.cpp @@ -21,16 +21,13 @@ #include "dist.hpp" #include "pipe.hpp" #include "err.hpp" -#include "own.hpp" #include "msg.hpp" #include "likely.hpp" -zmq::dist_t::dist_t (own_t *sink_) : +zmq::dist_t::dist_t () : active (0), eligible (0), - more (false), - sink (sink_), - terminating (false) + more (false) { } @@ -55,21 +52,6 @@ void zmq::dist_t::attach (pipe_t *pipe_) active++; eligible++; } - - if (unlikely (terminating)) { - sink->register_term_acks (1); - pipe_->terminate (); - } -} - -void zmq::dist_t::terminate () -{ - zmq_assert (!terminating); - terminating = true; - - sink->register_term_acks ((int) pipes.size ()); - for (pipes_t::size_type i = 0; i != pipes.size (); i++) - pipes [i]->terminate (); } void zmq::dist_t::terminated (pipe_t *pipe_) @@ -81,9 +63,6 @@ void zmq::dist_t::terminated (pipe_t *pipe_) if (pipes.index (pipe_) < eligible) eligible--; pipes.erase (pipe_); - - if (unlikely (terminating)) - sink->unregister_term_ack (); } void zmq::dist_t::activated (pipe_t *pipe_) |