From c8e8f2a24cd339c548e06f75a3cef96454671a85 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Fri, 15 Jul 2011 11:24:33 +0200 Subject: ZMQ_IDENTITY socket option removed This patch simplifies the whole codebase significantly, including dropping depedency on libuuid. Signed-off-by: Martin Sustrik --- src/zmq_connecter.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/zmq_connecter.cpp') diff --git a/src/zmq_connecter.cpp b/src/zmq_connecter.cpp index ca9bb77..0512c3c 100644 --- a/src/zmq_connecter.cpp +++ b/src/zmq_connecter.cpp @@ -30,7 +30,6 @@ #include "zmq_connecter.hpp" #include "zmq_engine.hpp" -#include "zmq_init.hpp" #include "io_thread.hpp" #include "err.hpp" @@ -86,16 +85,12 @@ void zmq::zmq_connecter_t::out_event () return; } - // Choose I/O thread to run connecter in. Given that we are already - // running in an I/O thread, there must be at least one available. - io_thread_t *io_thread = choose_io_thread (options.affinity); - zmq_assert (io_thread); + // Create the engine object for this connection. + zmq_engine_t *engine = new (std::nothrow) zmq_engine_t (fd, options); + alloc_assert (engine); - // Create an init object. - zmq_init_t *init = new (std::nothrow) zmq_init_t (io_thread, NULL, - session, fd, options); - alloc_assert (init); - launch_sibling (init); + // Attach the engine to the corresponding session object. + send_attach (session, engine); // Shut the connecter down. terminate (); -- cgit v1.2.3