Imported Upstream version 2.1.3upstream/2.1.3

1 files changed, 17 insertions, 53 deletions

diff --git a/src/epoll.cpp b/src/epoll.cpp
index e22eb8c..2c84f8c 100644
--- a/src/epoll.cpp
+++ b/src/epoll.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/>.
 */
 
@@ -45,18 +46,15 @@ zmq::epoll_t::~epoll_t ()
     //  Wait till the worker thread exits.
     worker.stop ();
 
-    //  Make sure there are no fds registered on shutdown.
-    zmq_assert (load.get () == 0);
-
     close (epoll_fd);
-    for (retired_t::iterator it = retired.begin (); it != retired.end (); it ++)
+    for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it)
         delete *it;
 }
 
 zmq::epoll_t::handle_t zmq::epoll_t::add_fd (fd_t fd_, i_poll_events *events_)
 {
     poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    zmq_assert (pe != NULL);
+    alloc_assert (pe);
 
     //  The memset is not actually needed. It's here to prevent debugging
     //  tools to complain about using uninitialised memory.
@@ -71,7 +69,7 @@ zmq::epoll_t::handle_t zmq::epoll_t::add_fd (fd_t fd_, i_poll_events *events_)
     errno_assert (rc != -1);
 
     //  Increase the load metric of the thread.
-    load.add (1);
+    adjust_load (1);
 
     return pe;
 }
@@ -85,7 +83,7 @@ void zmq::epoll_t::rm_fd (handle_t handle_)
     retired.push_back (pe);
 
     //  Decrease the load metric of the thread.
-    load.sub (1);
+    adjust_load (-1);
 }
 
 void zmq::epoll_t::set_pollin (handle_t handle_)
@@ -120,24 +118,6 @@ void zmq::epoll_t::reset_pollout (handle_t handle_)
     errno_assert (rc != -1);
 }
 
-void zmq::epoll_t::add_timer (i_poll_events *events_)
-{
-     timers.push_back (events_);
-}
-
-void zmq::epoll_t::cancel_timer (i_poll_events *events_)
-{
-    timers_t::iterator it = std::find (timers.begin (), timers.end (), events_);
-    if (it == timers.end ())
-        return;
-    timers.erase (it);
-}
-
-int zmq::epoll_t::get_load ()
-{
-    return load.get ();
-}
-
 void zmq::epoll_t::start ()
 {
     worker.start (worker_routine, this);
@@ -154,31 +134,15 @@ void zmq::epoll_t::loop ()
 
     while (!stopping) {
 
-        //  Wait for events.
-        int n;
-        while (true) {
-            n = epoll_wait (epoll_fd, &ev_buf [0], max_io_events,
-                timers.empty () ? -1 : max_timer_period);
-            if (!(n == -1 && errno == EINTR)) {
-                errno_assert (n != -1);
-                break;
-            }
-        }
-
-        //  Handle timer.
-        if (!n) {
-
-            //  Use local list of timers as timer handlers may fill new timers
-            //  into the original array.
-            timers_t t;
-            std::swap (timers, t);
-
-            //  Trigger all the timers.
-            for (timers_t::iterator it = t.begin (); it != t.end (); it ++)
-                (*it)->timer_event ();
+        //  Execute any due timers.
+        int timeout = (int) execute_timers ();
 
+        //  Wait for events.
+        int n = epoll_wait (epoll_fd, &ev_buf [0], max_io_events,
+            timeout ? timeout : -1);
+        if (n == -1 && errno == EINTR)
             continue;
-        }
+        errno_assert (n != -1);
 
         for (int i = 0; i < n; i ++) {
             poll_entry_t *pe = ((poll_entry_t*) ev_buf [i].data.ptr);
@@ -199,7 +163,7 @@ void zmq::epoll_t::loop ()
 
         //  Destroy retired event sources.
         for (retired_t::iterator it = retired.begin (); it != retired.end ();
-              it ++)
+              ++it)
             delete *it;
         retired.clear ();
     }