Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 28 insertions, 13 deletions

diff --git a/src/io_object.cpp b/src/io_object.cpp
index 086f173..e68917c 100644
--- a/src/io_object.cpp
+++ b/src/io_object.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/>.
 */
 
@@ -21,21 +22,35 @@
 #include "io_thread.hpp"
 #include "err.hpp"
 
-zmq::io_object_t::io_object_t (io_thread_t *io_thread_)
+zmq::io_object_t::io_object_t (io_thread_t *io_thread_) :
+    poller (NULL)
 {
-    //  Retrieve the poller from the thread we are running in.
-    poller = io_thread_->get_poller ();
+    if (io_thread_)
+        plug (io_thread_);
 }
 
 zmq::io_object_t::~io_object_t ()
 {
 }
 
-void zmq::io_object_t::set_io_thread (io_thread_t *io_thread_)
+void zmq::io_object_t::plug (io_thread_t *io_thread_)
 {
+    zmq_assert (io_thread_);
+    zmq_assert (!poller);
+
+    //  Retrieve the poller from the thread we are running in.
     poller = io_thread_->get_poller ();
 }
 
+void zmq::io_object_t::unplug ()
+{
+    zmq_assert (poller);
+
+    //  Forget about old poller in preparation to be migrated
+    //  to a different I/O thread.
+    poller = NULL;
+}
+
 zmq::io_object_t::handle_t zmq::io_object_t::add_fd (fd_t fd_)
 {
     return poller->add_fd (fd_, this);
@@ -66,14 +81,14 @@ void zmq::io_object_t::reset_pollout (handle_t handle_)
     poller->reset_pollout (handle_);
 }
 
-void zmq::io_object_t::add_timer ()
+void zmq::io_object_t::add_timer (int timeout_, int id_)
 {
-    poller->add_timer (this);
+    poller->add_timer (timeout_, this, id_);
 }
 
-void zmq::io_object_t::cancel_timer ()
+void zmq::io_object_t::cancel_timer (int id_)
 {
-    poller->cancel_timer (this);
+    poller->cancel_timer (this, id_);
 }
 
 void zmq::io_object_t::in_event ()
@@ -86,7 +101,7 @@ void zmq::io_object_t::out_event ()
     zmq_assert (false);
 }
 
-void zmq::io_object_t::timer_event ()
+void zmq::io_object_t::timer_event (int id_)
 {
     zmq_assert (false);
 }