Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 17 insertions, 14 deletions

diff --git a/src/io_thread.hpp b/src/io_thread.hpp
index 3d832c0..f578d4e 100644
--- a/src/io_thread.hpp
+++ b/src/io_thread.hpp
@@ -1,19 +1,20 @@
 /*
-    Copyright (c) 2007-2010 iMatix Corporation
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
     0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the Lesser GNU General Public License as published by
+    the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     0MQ is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Lesser GNU General Public License for more details.
+    GNU Lesser General Public License for more details.
 
-    You should have received a copy of the Lesser GNU General Public License
+    You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -26,7 +27,7 @@
 #include "object.hpp"
 #include "poller.hpp"
 #include "i_poll_events.hpp"
-#include "signaler.hpp"
+#include "mailbox.hpp"
 
 namespace zmq
 {
@@ -38,7 +39,7 @@ namespace zmq
     {
     public:
 
-        io_thread_t (class ctx_t *ctx_, uint32_t thread_slot_);
+        io_thread_t (class ctx_t *ctx_, uint32_t tid_);
 
         //  Clean-up. If the thread was started, it's neccessary to call 'stop'
         //  before invoking destructor. Otherwise the destructor would hang up.
@@ -50,13 +51,13 @@ namespace zmq
         //  Ask underlying thread to stop.
         void stop ();
 
-        //  Returns signaler associated with this I/O thread.
-        signaler_t *get_signaler ();
+        //  Returns mailbox associated with this I/O thread.
+        mailbox_t *get_mailbox ();
 
         //  i_poll_events implementation.
         void in_event ();
         void out_event ();
-        void timer_event ();
+        void timer_event (int id_);
 
         //  Used by io_objects to retrieve the assciated poller object.
         poller_t *get_poller ();
@@ -69,15 +70,17 @@ namespace zmq
 
     private:
 
-        //  Poll thread gets notifications about incoming commands using
-        //  this signaler.
-        signaler_t signaler;
+        //  I/O thread accesses incoming commands via this mailbox.
+        mailbox_t mailbox;
 
-        //  Handle associated with signaler's file descriptor.
-        poller_t::handle_t signaler_handle;
+        //  Handle associated with mailbox' file descriptor.
+        poller_t::handle_t mailbox_handle;
 
         //  I/O multiplexing is performed using a poller object.
         poller_t *poller;
+
+        io_thread_t (const io_thread_t&);
+        const io_thread_t &operator = (const io_thread_t&);
     };
 
 }