From 05d908492dc382941fc633ad7082b5bd86e84e67 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Fri, 6 Aug 2010 17:49:37 +0200
Subject: WIP: Socket migration between threads, new zmq_close() semantics

Sockets may now be migrated between OS threads; sockets may not be used by
more than one thread at any time. To migrate a socket to another thread the
caller must ensure that a full memory barrier is called before using the
socket from the target thread.

The new zmq_close() semantics implement the behaviour discussed at:

http://lists.zeromq.org/pipermail/zeromq-dev/2010-July/004244.html

Specifically, zmq_close() is now deterministic and while it still returns
immediately, it does not discard any data that may still be queued for
sending. Further, zmq_term() will now block until all outstanding data has
been sent.

TODO: Many bugs have been introduced, needs testing. Further, SO_LINGER or
an equivalent mechanism (possibly a configurable timeout to zmq_term())
needs to be implemented.
---
 src/sub.cpp | 40 ++++++----------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

(limited to 'src/sub.cpp')

diff --git a/src/sub.cpp b/src/sub.cpp
index eeb50cd..a1e8fb7 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -24,8 +24,8 @@
 #include "sub.hpp"
 #include "err.hpp"
 
-zmq::sub_t::sub_t (class app_thread_t *parent_) :
-    socket_base_t (parent_),
+zmq::sub_t::sub_t (class ctx_t *parent_, uint32_t slot_) :
+    socket_base_t (parent_, slot_),
     has_message (false),
     more (false)
 {
@@ -46,31 +46,14 @@ void zmq::sub_t::xattach_pipes (class reader_t *inpipe_,
     fq.attach (inpipe_);
 }
 
-void zmq::sub_t::xdetach_inpipe (class reader_t *pipe_)
+void zmq::sub_t::xterm_pipes ()
 {
-    zmq_assert (pipe_);
-    fq.detach (pipe_);
+    fq.term_pipes ();
 }
 
-void zmq::sub_t::xdetach_outpipe (class writer_t *pipe_)
+bool zmq::sub_t::xhas_pipes ()
 {
-    //  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);
+    return fq.has_pipes ();
 }
 
 int zmq::sub_t::xsetsockopt (int option_, const void *optval_,
@@ -93,12 +76,6 @@ int zmq::sub_t::xsetsockopt (int option_, const void *optval_,
     return -1;
 }
 
-int zmq::sub_t::xsend (zmq_msg_t *msg_, int flags_)
-{
-    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,
@@ -179,11 +156,6 @@ bool zmq::sub_t::xhas_in ()
     }
 }
 
-bool zmq::sub_t::xhas_out ()
-{
-    return false;
-}
-
 bool zmq::sub_t::match (zmq_msg_t *msg_)
 {
     return subscriptions.check ((unsigned char*) zmq_msg_data (msg_),
-- 
cgit v1.2.3