tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix race condition problem with epoll_ctl() 

refs #11289
This commit is contained in:
Gunnar Beutner 2016-03-03 13:37:16 +01:00
parent 9cdea730a3
commit 47521904c1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/base/socketevents.cpp
View File

@ -369,13 +369,6 @@ void SocketEvents::ChangeEvents(int events)
int tid = m_ID % SOCKET_IOTHREADS; int tid = m_ID % SOCKET_IOTHREADS;
#ifdef __linux__
epoll_event event;
memset(&event, 0, sizeof(event));
event.data.fd = m_FD;
event.events = PollToEpoll(events);
epoll_ctl(l_SocketIOPollFDs[tid], EPOLL_CTL_MOD, m_FD, &event);
#else /* __linux__ */
{ {
boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]); boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]);
@ -384,6 +377,13 @@ void SocketEvents::ChangeEvents(int events)
if (it == l_SocketIOSockets[tid].end()) if (it == l_SocketIOSockets[tid].end())
return; return;
#ifdef __linux__
epoll_event event;
memset(&event, 0, sizeof(event));
event.data.fd = m_FD;
event.events = PollToEpoll(events);
epoll_ctl(l_SocketIOPollFDs[tid], EPOLL_CTL_MOD, m_FD, &event);
#else /* __linux__ */
if (it->second.Events == events) if (it->second.Events == events)
return; return;
@ -393,8 +393,10 @@ void SocketEvents::ChangeEvents(int events)
m_PFD->events = events; m_PFD->events = events;
else else
l_SocketIOFDChanged[tid] = true; l_SocketIOFDChanged[tid] = true;
#endif /* __linux__ */
} }
#ifndef __linux__
WakeUpThread(); WakeUpThread();
#endif /* __linux__ */ #endif /* __linux__ */
} }