Merge pull request #276 from pieterh/master

Removed last vestiges of thread-safe sockets

src/ctx.cpp

@@ -81,16 +81,6 @@ zmq::ctx_t::ctx_t (uint32_t io_threads_) :
     zmq_assert (rc == 0);
 }
 
-void zmq::ctx_t::set_thread_safe() 
-{
-  thread_safe_flag = true;
-}
-
-bool zmq::ctx_t::get_thread_safe() const
-{
-  return thread_safe_flag;
-}
-
 bool zmq::ctx_t::check_tag ()
 {
     return tag == 0xbadcafe0;

src/ctx.hpp

@@ -99,10 +99,6 @@ namespace zmq
             reaper_tid = 1
         };
 
-        // create thread safe sockets
-        void set_thread_safe();
-        bool get_thread_safe() const;
-
         ~ctx_t ();
     private:
 
@@ -155,8 +151,6 @@ namespace zmq
         zmq::socket_base_t *log_socket;
         mutex_t log_sync;
 
-        bool thread_safe_flag;
-
         ctx_t (const ctx_t&);
         const ctx_t &operator = (const ctx_t&);
     };

src/socket_base.cpp

@@ -128,8 +128,7 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_) :
     destroyed (false),
     last_tsc (0),
     ticks (0),
-    rcvmore (false),
-    thread_safe_flag (false)
+    rcvmore (false)
 {
 }
 
@@ -910,19 +909,3 @@ void zmq::socket_base_t::extract_flags (msg_t *msg_)
     //  Remove MORE flag.
     rcvmore = msg_->flags () & msg_t::more ? true : false;
 }
-
-void zmq::socket_base_t::set_thread_safe()
-{
-   thread_safe_flag = true;
-}
-
-void zmq::socket_base_t::lock() 
-{
-   sync.lock();
-}
-
-void zmq::socket_base_t::unlock() 
-{
-   sync.unlock();
-}
-

src/socket_base.hpp

@@ -95,8 +95,6 @@ namespace zmq
         void write_activated (pipe_t *pipe_);
         void hiccuped (pipe_t *pipe_);
         void terminated (pipe_t *pipe_);
-        bool thread_safe() const { return thread_safe_flag; }
-        void set_thread_safe(); // should be in constructor, here for compat
         void lock();
         void unlock();
     protected:
@@ -198,7 +196,6 @@ namespace zmq
 
         socket_base_t (const socket_base_t&);
         const socket_base_t &operator = (const socket_base_t&);
-        bool thread_safe_flag;
         mutex_t sync;
     };