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/socket_base.hpp | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'src/socket_base.hpp') diff --git a/src/socket_base.hpp b/src/socket_base.hpp index f114e9d..fb60bbe 100644 --- a/src/socket_base.hpp +++ b/src/socket_base.hpp @@ -21,21 +21,17 @@ #ifndef __ZMQ_SOCKET_BASE_HPP_INCLUDED__ #define __ZMQ_SOCKET_BASE_HPP_INCLUDED__ -#include -#include +#include #include "own.hpp" #include "array.hpp" -#include "mutex.hpp" #include "stdint.hpp" #include "poller.hpp" #include "atomic_counter.hpp" #include "i_poll_events.hpp" #include "mailbox.hpp" #include "stdint.hpp" -#include "blob.hpp" #include "pipe.hpp" -#include "own.hpp" namespace zmq { @@ -78,11 +74,6 @@ namespace zmq bool has_in (); bool has_out (); - // Registry of named sessions. - bool register_session (const blob_t &name_, class session_t *session_); - void unregister_session (const blob_t &name_); - class session_t *find_session (const blob_t &name_); - // Using this function reaper thread ask the socket to regiter with // its poller. void start_reaping (poller_t *poller_); @@ -106,8 +97,7 @@ namespace zmq // Concrete algorithms for the x- methods are to be defined by // individual socket types. - virtual void xattach_pipe (class pipe_t *pipe_, - const blob_t &peer_identity_) = 0; + virtual void xattach_pipe (class pipe_t *pipe_) = 0; // The default implementation assumes there are no specific socket // options for the particular socket type. If not so, overload this @@ -158,7 +148,7 @@ namespace zmq int check_protocol (const std::string &protocol_); // Register the pipe with this socket. - void attach_pipe (class pipe_t *pipe_, const blob_t &peer_identity_); + void attach_pipe (class pipe_t *pipe_); // Processes commands sent to this socket (if any). If timeout is -1, // returns only after at least one command was processed. @@ -168,7 +158,7 @@ namespace zmq // Handlers for incoming commands. void process_stop (); - void process_bind (class pipe_t *pipe_, const blob_t &peer_identity_); + void process_bind (class pipe_t *pipe_); void process_unplug (); void process_term (int linger_); @@ -195,14 +185,6 @@ namespace zmq // True if the last message received had MORE flag set. bool rcvmore; - // Lists of existing sessions. This list is never referenced from - // within the socket, instead it is used by objects owned by - // the socket. As those objects can live in different threads, - // the access is synchronised by mutex. - typedef std::map sessions_t; - sessions_t sessions; - mutex_t sessions_sync; - socket_base_t (const socket_base_t&); const socket_base_t &operator = (const socket_base_t&); }; -- cgit v1.2.3