Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 33 insertions, 149 deletions

diff --git a/src/sub.cpp b/src/sub.cpp
index eeb50cd..aef7369 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -1,191 +1,75 @@
 /*
-    Copyright (c) 2007-2010 iMatix Corporation
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
     0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the Lesser GNU General Public License as published by
+    the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     0MQ is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Lesser GNU General Public License for more details.
+    GNU Lesser General Public License for more details.
 
-    You should have received a copy of the Lesser GNU General Public License
+    You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string.h>
-
 #include "../include/zmq.h"
 
 #include "sub.hpp"
-#include "err.hpp"
 
-zmq::sub_t::sub_t (class app_thread_t *parent_) :
-    socket_base_t (parent_),
-    has_message (false),
-    more (false)
+zmq::sub_t::sub_t (class ctx_t *parent_, uint32_t tid_) :
+    xsub_t (parent_, tid_)
 {
-    options.requires_in = true;
-    options.requires_out = false;
-    zmq_msg_init (&message);
+    options.type = ZMQ_SUB;
 }
 
 zmq::sub_t::~sub_t ()
 {
-    zmq_msg_close (&message);
-}
-
-void zmq::sub_t::xattach_pipes (class reader_t *inpipe_,
-    class writer_t *outpipe_, const blob_t &peer_identity_)
-{
-    zmq_assert (inpipe_ && !outpipe_);
-    fq.attach (inpipe_);
-}
-
-void zmq::sub_t::xdetach_inpipe (class reader_t *pipe_)
-{
-    zmq_assert (pipe_);
-    fq.detach (pipe_);
-}
-
-void zmq::sub_t::xdetach_outpipe (class writer_t *pipe_)
-{
-    //  SUB socket is read-only thus there should be no outpipes.
-    zmq_assert (false);
-}
-
-void zmq::sub_t::xkill (class reader_t *pipe_)
-{
-    fq.kill (pipe_);
-}
-
-void zmq::sub_t::xrevive (class reader_t *pipe_)
-{
-    fq.revive (pipe_);
-}
-
-void zmq::sub_t::xrevive (class writer_t *pipe_)
-{
-    zmq_assert (false);
 }
 
 int zmq::sub_t::xsetsockopt (int option_, const void *optval_,
     size_t optvallen_)
 {
-    if (option_ == ZMQ_SUBSCRIBE) {
-        subscriptions.add ((unsigned char*) optval_, optvallen_);
-        return 0;
-    }
-    
-    if (option_ == ZMQ_UNSUBSCRIBE) {
-        if (!subscriptions.rm ((unsigned char*) optval_, optvallen_)) {
-            errno = EINVAL;
-            return -1;
-        }
-        return 0;
+    if (option_ != ZMQ_SUBSCRIBE && option_ != ZMQ_UNSUBSCRIBE) {
+        errno = EINVAL;
+        return -1;
     }
 
-    errno = EINVAL;
-    return -1;
+    //  Create the subscription message.
+    zmq_msg_t msg;
+    zmq_msg_init_size (&msg, optvallen_ + 1);
+    unsigned char *data = (unsigned char*) zmq_msg_data (&msg);
+    if (option_ == ZMQ_SUBSCRIBE)
+        *data = 1;
+    else if (option_ == ZMQ_UNSUBSCRIBE)
+        *data = 0;
+    memcpy (data + 1, optval_, optvallen_);
+
+    //  Pass it further on in the stack.
+    int err = 0;
+    int rc = xsub_t::xsend (&msg, 0);
+    if (rc != 0)
+        err = errno;
+    zmq_msg_close (&msg);
+    if (rc != 0)
+        errno = err;
+    return rc;
 }
 
-int zmq::sub_t::xsend (zmq_msg_t *msg_, int flags_)
+int zmq::sub_t::xsend (zmq_msg_t *msg_, int options_)
 {
+    //  Overload the XSUB's send.
     errno = ENOTSUP;
     return -1;
 }
 
-int zmq::sub_t::xrecv (zmq_msg_t *msg_, int flags_)
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return it straight ahead.
-    if (has_message) {
-        zmq_msg_move (msg_, &message);
-        has_message = false;
-        more = msg_->flags & ZMQ_MSG_MORE;
-        return 0;
-    }
-
-    //  TODO: This can result in infinite loop in the case of continuous
-    //  stream of non-matching messages which breaks the non-blocking recv
-    //  semantics.
-    while (true) {
-
-        //  Get a message using fair queueing algorithm.
-        int rc = fq.recv (msg_, flags_);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0)
-            return -1;
-
-        //  Check whether the message matches at least one subscription.
-        //  Non-initial parts of the message are passed 
-        if (more || match (msg_)) {
-            more = msg_->flags & ZMQ_MSG_MORE;
-            return 0;
-        }
-
-        //  Message doesn't match. Pop any remaining parts of the message
-        //  from the pipe.
-        while (msg_->flags & ZMQ_MSG_MORE) {
-            rc = fq.recv (msg_, ZMQ_NOBLOCK);
-            zmq_assert (rc == 0);
-        }
-    }
-}
-
-bool zmq::sub_t::xhas_in ()
-{
-    //  There are subsequent parts of the partly-read message available.
-    if (more)
-        return true;
-
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return straight ahead.
-    if (has_message)
-        return true;
-
-    //  TODO: This can result in infinite loop in the case of continuous
-    //  stream of non-matching messages.
-    while (true) {
-
-        //  Get a message using fair queueing algorithm.
-        int rc = fq.recv (&message, ZMQ_NOBLOCK);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0) {
-            zmq_assert (errno == EAGAIN);
-            return false;
-        }
-
-        //  Check whether the message matches at least one subscription.
-        if (match (&message)) {
-            has_message = true;
-            return true;
-        }
-
-        //  Message doesn't match. Pop any remaining parts of the message
-        //  from the pipe.
-        while (message.flags & ZMQ_MSG_MORE) {
-            rc = fq.recv (&message, ZMQ_NOBLOCK);
-            zmq_assert (rc == 0);
-        }
-    }
-}
-
 bool zmq::sub_t::xhas_out ()
 {
+    //  Overload the XSUB's send.
     return false;
 }
-
-bool zmq::sub_t::match (zmq_msg_t *msg_)
-{
-    return subscriptions.check ((unsigned char*) zmq_msg_data (msg_),
-        zmq_msg_size (msg_));
-}