diff --git a/src/epoll.cpp b/src/epoll.cpp index ab792164..1b726885 100644 --- a/src/epoll.cpp +++ b/src/epoll.cpp @@ -92,9 +92,7 @@ void zmq::epoll_t::rm_fd (handle_t handle_) int rc = epoll_ctl (epoll_fd, EPOLL_CTL_DEL, pe->fd, &pe->ev); errno_assert (rc != -1); pe->fd = retired_fd; - retired_sync.lock (); retired.push_back (pe); - retired_sync.unlock (); // Decrease the load metric of the thread. adjust_load (-1); @@ -182,12 +180,10 @@ void zmq::epoll_t::loop () } // Destroy retired event sources. - retired_sync.lock (); for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it) { LIBZMQ_DELETE(*it); } retired.clear (); - retired_sync.unlock (); } } diff --git a/src/epoll.hpp b/src/epoll.hpp index 6c2f9219..567a4bf3 100644 --- a/src/epoll.hpp +++ b/src/epoll.hpp @@ -41,7 +41,6 @@ #include "fd.hpp" #include "thread.hpp" #include "poller_base.hpp" -#include "mutex.h" namespace zmq { @@ -103,9 +102,6 @@ namespace zmq // Handle of the physical thread doing the I/O work. thread_t worker; - // Synchronisation of the retired event source - mutex_t retired_sync; - epoll_t (const epoll_t&); const epoll_t &operator = (const epoll_t&); };