From a348d94c09ab93a19a57ec22a86782e45f1d06ac Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Fri, 14 Jan 2011 12:38:07 +0100 Subject: Fair queueing of subscriptions added to XPUB socket Signed-off-by: Martin Sustrik --- src/xpub.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src/xpub.cpp') diff --git a/src/xpub.cpp b/src/xpub.cpp index ed9c0e5..630450b 100644 --- a/src/xpub.cpp +++ b/src/xpub.cpp @@ -25,10 +25,11 @@ zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_) : socket_base_t (parent_, tid_), - dist (this) + dist (this), + fq (this) { options.type = ZMQ_XPUB; - options.requires_in = false; + options.requires_in = true; options.requires_out = true; } @@ -39,14 +40,16 @@ zmq::xpub_t::~xpub_t () void zmq::xpub_t::xattach_pipes (class reader_t *inpipe_, class writer_t *outpipe_, const blob_t &peer_identity_) { - zmq_assert (!inpipe_); + zmq_assert (inpipe_ && outpipe_); dist.attach (outpipe_); + fq.attach (inpipe_); } void zmq::xpub_t::process_term (int linger_) { // Terminate the outbound pipes. dist.terminate (); + fq.terminate (); // Continue with the termination immediately. socket_base_t::process_term (linger_); @@ -62,3 +65,13 @@ bool zmq::xpub_t::xhas_out () return dist.has_out (); } +int zmq::xpub_t::xrecv (zmq_msg_t *msg_, int flags_) +{ + return fq.recv (msg_, flags_); +} + +bool zmq::xpub_t::xhas_in () +{ + return fq.has_in (); +} + -- cgit v1.2.3