1 files changed, 11 insertions, 29 deletions
diff --git a/src/xreq.cpp b/src/xreq.cpp
index 66e5cc3..e511660 100644
--- a/src/xreq.cpp
+++ b/src/xreq.cpp
@@ -22,8 +22,10 @@
 #include "xreq.hpp"
 #include "err.hpp"
 
-zmq::xreq_t::xreq_t (class app_thread_t *parent_) :
-    socket_base_t (parent_)
+zmq::xreq_t::xreq_t (class ctx_t *parent_, uint32_t slot_) :
+    socket_base_t (parent_, slot_),
+    fq (this),
+    lb (this)
 {
     options.requires_in = true;
     options.requires_out = true;
@@ -41,38 +43,18 @@ void zmq::xreq_t::xattach_pipes (class reader_t *inpipe_,
     lb.attach (outpipe_);
 }
 
-void zmq::xreq_t::xdetach_inpipe (class reader_t *pipe_)
+void zmq::xreq_t::process_term ()
 {
-    zmq_assert (pipe_);
-    fq.detach (pipe_);
-}
-
-void zmq::xreq_t::xdetach_outpipe (class writer_t *pipe_)
-{
-    zmq_assert (pipe_);
-    lb.detach (pipe_);
-}
+    register_term_acks (2);
+    fq.terminate ();
+    lb.terminate ();
 
-void zmq::xreq_t::xkill (class reader_t *pipe_)
-{
-    fq.kill (pipe_);
-}
-
-void zmq::xreq_t::xrevive (class reader_t *pipe_)
-{
-    fq.revive (pipe_);
-}
-
-void zmq::xreq_t::xrevive (class writer_t *pipe_)
-{
-    lb.revive (pipe_);
+    socket_base_t::process_term ();
 }
 
-int zmq::xreq_t::xsetsockopt (int option_, const void *optval_,
-    size_t optvallen_)
+void zmq::xreq_t::terminated ()
 {
-    errno = EINVAL;
-    return -1;
+    unregister_term_ack ();
 }
 
 int zmq::xreq_t::xsend (zmq_msg_t *msg_, int flags_)