Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 19 insertions, 15 deletions

diff --git a/src/io_thread.cpp b/src/io_thread.cpp
index fac6961..be52bdd 100644
--- a/src/io_thread.cpp
+++ b/src/io_thread.cpp
@@ -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,15 +27,14 @@
 #include "err.hpp"
 #include "ctx.hpp"
 
-zmq::io_thread_t::io_thread_t (ctx_t *ctx_,
-      uint32_t thread_slot_) :
-    object_t (ctx_, thread_slot_)
+zmq::io_thread_t::io_thread_t (ctx_t *ctx_, uint32_t tid_) :
+    object_t (ctx_, tid_)
 {
     poller = new (std::nothrow) poller_t;
-    zmq_assert (poller);
+    alloc_assert (poller);
 
-    signaler_handle = poller->add_fd (signaler.get_fd (), this);
-    poller->set_pollin (signaler_handle);
+    mailbox_handle = poller->add_fd (mailbox.get_fd (), this);
+    poller->set_pollin (mailbox_handle);
 }
 
 zmq::io_thread_t::~io_thread_t ()
@@ -53,9 +53,9 @@ void zmq::io_thread_t::stop ()
     send_stop ();
 }
 
-zmq::signaler_t *zmq::io_thread_t::get_signaler ()
+zmq::mailbox_t *zmq::io_thread_t::get_mailbox ()
 {
-    return &signaler;
+    return &mailbox;
 }
 
 int zmq::io_thread_t::get_load ()
@@ -72,8 +72,12 @@ void zmq::io_thread_t::in_event ()
 
         //  Get the next command. If there is none, exit.
         command_t cmd;
-        if (!signaler.recv (&cmd, false))
+        int rc = mailbox.recv (&cmd, false);
+        if (rc != 0 && errno == EINTR)
+            continue;
+        if (rc != 0 && errno == EAGAIN)
             break;
+        errno_assert (rc == 0);
 
         //  Process the command.
         cmd.destination->process_command (cmd);
@@ -86,7 +90,7 @@ void zmq::io_thread_t::out_event ()
     zmq_assert (false);
 }
 
-void zmq::io_thread_t::timer_event ()
+void zmq::io_thread_t::timer_event (int id_)
 {
     //  No timers here. This function is never called.
     zmq_assert (false);
@@ -100,6 +104,6 @@ zmq::poller_t *zmq::io_thread_t::get_poller ()
 
 void zmq::io_thread_t::process_stop ()
 {
-    poller->rm_fd (signaler_handle);
+    poller->rm_fd (mailbox_handle);
     poller->stop ();
 }