3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-28 16:15:23 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2239 from loachfish/master

Browse Source 
avoid crashing in the multi-thread operation for std::vector
This commit is contained in:
Luca Boccassi 2016-12-05 14:22:28 +01:00 committed by GitHub
commit 3f8e6c0812
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/epoll.cpp
View File

@ -92,7 +92,9 @@ void zmq::epoll_t::rm_fd (handle_t handle_)
int rc = epoll_ctl (epoll_fd, EPOLL_CTL_DEL, pe->fd, &pe->ev); int rc = epoll_ctl (epoll_fd, EPOLL_CTL_DEL, pe->fd, &pe->ev);
errno_assert (rc != -1); errno_assert (rc != -1);
pe->fd = retired_fd; pe->fd = retired_fd;
retired_sync.lock ();
retired.push_back (pe); retired.push_back (pe);
retired_sync.unlock ();
// Decrease the load metric of the thread. // Decrease the load metric of the thread.
adjust_load (-1); adjust_load (-1);
@ -180,10 +182,12 @@ void zmq::epoll_t::loop ()
} }
// Destroy retired event sources. // Destroy retired event sources.
retired_sync.lock ();
for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it) { for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it) {
LIBZMQ_DELETE(*it); LIBZMQ_DELETE(*it);
} }
retired.clear (); retired.clear ();
retired_sync.unlock ();
} }
} }

4
src/epoll.hpp
View File

@ -41,6 +41,7 @@
#include "fd.hpp" #include "fd.hpp"
#include "thread.hpp" #include "thread.hpp"
#include "poller_base.hpp" #include "poller_base.hpp"
#include "mutex.hpp"
namespace zmq namespace zmq
{ {
@ -102,6 +103,9 @@ namespace zmq
// Handle of the physical thread doing the I/O work. // Handle of the physical thread doing the I/O work.
thread_t worker; thread_t worker;
// Synchronisation of retired event sources
mutex_t retired_sync;
epoll_t (const epoll_t&); epoll_t (const epoll_t&);
const epoll_t &operator = (const epoll_t&); const epoll_t &operator = (const epoll_t&);
}; };