Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 8 insertions, 18 deletions

diff --git a/src/epoll.hpp b/src/epoll.hpp
index 38175cb..7e5195e 100644
--- a/src/epoll.hpp
+++ b/src/epoll.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/>.
 */
 
@@ -29,7 +30,7 @@
 
 #include "fd.hpp"
 #include "thread.hpp"
-#include "atomic_counter.hpp"
+#include "poller_base.hpp"
 
 namespace zmq
 {
@@ -37,7 +38,7 @@ namespace zmq
     //  This class implements socket polling mechanism using the Linux-specific
     //  epoll mechanism.
 
-    class epoll_t
+    class epoll_t : public poller_base_t
     {
     public:
 
@@ -53,9 +54,6 @@ namespace zmq
         void reset_pollin (handle_t handle_);
         void set_pollout (handle_t handle_);
         void reset_pollout (handle_t handle_);
-        void add_timer (struct i_poll_events *events_);
-        void cancel_timer (struct i_poll_events *events_);
-        int get_load ();
         void start ();
         void stop ();
 
@@ -81,22 +79,14 @@ namespace zmq
         typedef std::vector <poll_entry_t*> retired_t;
         retired_t retired;
 
-        //  List of all the engines waiting for the timer event.
-        typedef std::vector <struct i_poll_events*> timers_t;
-        timers_t timers;
-
         //  If true, thread is in the process of shutting down.
         bool stopping;
 
         //  Handle of the physical thread doing the I/O work.
         thread_t worker;
 
-        //  Load of the poller. Currently number of file descriptors
-        //  registered with the poller.
-        atomic_counter_t load;
-
         epoll_t (const epoll_t&);
-        void operator = (const epoll_t&);
+        const epoll_t &operator = (const epoll_t&);
     };
 
 }