From acf0b0e515515e51ad32ba7a2d147ce703579478 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Sun, 22 May 2011 17:26:53 +0200 Subject: Introduces bi-directional pipes So far, there was a pair of unidirectional pipes between a socket and a session (or an inproc peer). This resulted in complex problems with half-closed states and tracking which inpipe corresponds to which outpipe. This patch doesn't add any functionality in itself, but is essential for further work on features like subscription forwarding. Signed-off-by: Martin Sustrik --- src/xsub.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'src/xsub.cpp') diff --git a/src/xsub.cpp b/src/xsub.cpp index b0e8cd2..dc30d71 100644 --- a/src/xsub.cpp +++ b/src/xsub.cpp @@ -30,8 +30,6 @@ zmq::xsub_t::xsub_t (class ctx_t *parent_, uint32_t tid_) : more (false) { options.type = ZMQ_XSUB; - options.requires_in = true; - options.requires_out = false; int rc = message.init (); errno_assert (rc == 0); } @@ -42,11 +40,27 @@ zmq::xsub_t::~xsub_t () errno_assert (rc == 0); } -void zmq::xsub_t::xattach_pipes (class reader_t *inpipe_, - class writer_t *outpipe_, const blob_t &peer_identity_) +void zmq::xsub_t::xattach_pipe (pipe_t *pipe_, const blob_t &peer_identity_) { - zmq_assert (inpipe_ && !outpipe_); - fq.attach (inpipe_); + zmq_assert (pipe_); + pipe_->set_event_sink (this); + fq.attach (pipe_); +} + +void zmq::xsub_t::read_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_) +{ + fq.terminated (pipe_); } void zmq::xsub_t::process_term (int linger_) -- cgit v1.2.3