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/push.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/push.cpp') diff --git a/src/push.cpp b/src/push.cpp index 12fc8d2..44ebc07 100644 --- a/src/push.cpp +++ b/src/push.cpp @@ -24,8 +24,7 @@ #include "msg.hpp" zmq::push_t::push_t (class ctx_t *parent_, uint32_t tid_) : - socket_base_t (parent_, tid_), - lb (this) + socket_base_t (parent_, tid_) { options.type = ZMQ_PUSH; } @@ -37,32 +36,19 @@ zmq::push_t::~push_t () void zmq::push_t::xattach_pipe (pipe_t *pipe_, const blob_t &peer_identity_) { zmq_assert (pipe_); - pipe_->set_event_sink (this); lb.attach (pipe_); } -void zmq::push_t::read_activated (pipe_t *pipe_) -{ - // There are no inbound messages in push socket. This should never happen. - zmq_assert (false); -} - -void zmq::push_t::write_activated (pipe_t *pipe_) +void zmq::push_t::xwrite_activated (pipe_t *pipe_) { lb.activated (pipe_); } -void zmq::push_t::terminated (pipe_t *pipe_) +void zmq::push_t::xterminated (pipe_t *pipe_) { lb.terminated (pipe_); } -void zmq::push_t::process_term (int linger_) -{ - lb.terminate (); - socket_base_t::process_term (linger_); -} - int zmq::push_t::xsend (msg_t *msg_, int flags_) { return lb.send (msg_, flags_); -- cgit v1.2.3