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.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/xsub.cpp') diff --git a/src/xsub.cpp b/src/xsub.cpp index dc30d71..c5f610f 100644 --- a/src/xsub.cpp +++ b/src/xsub.cpp @@ -25,7 +25,6 @@ zmq::xsub_t::xsub_t (class ctx_t *parent_, uint32_t tid_) : socket_base_t (parent_, tid_), - fq (this), has_message (false), more (false) { @@ -43,32 +42,19 @@ zmq::xsub_t::~xsub_t () void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, const blob_t &peer_identity_) { zmq_assert (pipe_); - pipe_->set_event_sink (this); fq.attach (pipe_); } -void zmq::xsub_t::read_activated (pipe_t *pipe_) +void zmq::xsub_t::xread_activated (pipe_t *pipe_) { fq.activated (pipe_); } -void zmq::xsub_t::write_activated (pipe_t *pipe_) -{ - // SUB socket never sends messages. This should never happen. - zmq_assert (false); -} - -void zmq::xsub_t::terminated (pipe_t *pipe_) +void zmq::xsub_t::xterminated (pipe_t *pipe_) { fq.terminated (pipe_); } -void zmq::xsub_t::process_term (int linger_) -{ - fq.terminate (); - socket_base_t::process_term (linger_); -} - int zmq::xsub_t::xsend (msg_t *msg_, int options_) { size_t size = msg_->size (); -- cgit v1.2.3