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.

1 files changed, 6 insertions, 42 deletions

diff --git a/src/pull.cpp b/src/pull.cpp
index b2413ee..4f4a8b3 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -22,8 +22,8 @@
 #include "pull.hpp"
 #include "err.hpp"
 
-zmq::pull_t::pull_t (class app_thread_t *parent_) :
-    socket_base_t (parent_)
+zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t slot_) :
+    socket_base_t (parent_, slot_)
 {
     options.requires_in = true;
     options.requires_out = false;
@@ -40,45 +40,14 @@ void zmq::pull_t::xattach_pipes (class reader_t *inpipe_,
     fq.attach (inpipe_);
 }
 
-void zmq::pull_t::xdetach_inpipe (class reader_t *pipe_)
+void zmq::pull_t::xterm_pipes ()
 {
-    zmq_assert (pipe_);
-    fq.detach (pipe_);
+    fq.term_pipes ();
 }
 
-void zmq::pull_t::xdetach_outpipe (class writer_t *pipe_)
+bool zmq::pull_t::xhas_pipes ()
 {
-    //  There are no outpipes, so this function shouldn't be called at all.
-    zmq_assert (false);
-}
-
-void zmq::pull_t::xkill (class reader_t *pipe_)
-{
-    fq.kill (pipe_);
-}
-
-void zmq::pull_t::xrevive (class reader_t *pipe_)
-{
-    fq.revive (pipe_);
-}
-
-void zmq::pull_t::xrevive (class writer_t *pipe_)
-{
-    zmq_assert (false);
-}
-
-int zmq::pull_t::xsetsockopt (int option_, const void *optval_,
-    size_t optvallen_)
-{
-    //  No special options for this socket type.
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::pull_t::xsend (zmq_msg_t *msg_, int flags_)
-{
-    errno = ENOTSUP;
-    return -1;
+    return fq.has_pipes ();
 }
 
 int zmq::pull_t::xrecv (zmq_msg_t *msg_, int flags_)
@@ -91,8 +60,3 @@ bool zmq::pull_t::xhas_in ()
     return fq.has_in ();
 }
 
-bool zmq::pull_t::xhas_out ()
-{
-    return false;
-}
-