tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-04 12:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary pollfd updates

Browse Source 
refs #11014
This commit is contained in:
Gunnar Beutner 2016-02-02 09:52:23 +01:00
parent 0fbbe620f9
commit d36c3d4066
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/base/socketevents.cpp
View File

@ -24,10 +24,6 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <map> #include <map>
#ifndef _WIN32
# include <poll.h>
#endif /* _WIN32 */
using namespace icinga; using namespace icinga;
struct SocketEventDescriptor struct SocketEventDescriptor
@ -55,6 +51,7 @@ static boost::mutex l_SocketIOMutex;
static boost::condition_variable l_SocketIOCV; static boost::condition_variable l_SocketIOCV;
static bool l_SocketIOFDChanged; static bool l_SocketIOFDChanged;
static std::map<SOCKET, SocketEventDescriptor> l_SocketIOSockets; static std::map<SOCKET, SocketEventDescriptor> l_SocketIOSockets;
static std::map<SOCKET, int> l_SocketIOEventChanges;
void SocketEvents::InitializeThread(void) void SocketEvents::InitializeThread(void)
{ {
@ -88,6 +85,8 @@ void SocketEvents::ThreadProc(void)
boost::mutex::scoped_lock lock(l_SocketIOMutex); boost::mutex::scoped_lock lock(l_SocketIOMutex);
if (l_SocketIOFDChanged) { if (l_SocketIOFDChanged) {
Log(LogWarning, "SocketEvents", "Updated event FDs");
pfds.resize(l_SocketIOSockets.size()); pfds.resize(l_SocketIOSockets.size());
descriptors.resize(l_SocketIOSockets.size()); descriptors.resize(l_SocketIOSockets.size());
@ -96,9 +95,11 @@ void SocketEvents::ThreadProc(void)
typedef std::map<SOCKET, SocketEventDescriptor>::value_type kv_pair; typedef std::map<SOCKET, SocketEventDescriptor>::value_type kv_pair;
BOOST_FOREACH(const kv_pair& desc, l_SocketIOSockets) { BOOST_FOREACH(const kv_pair& desc, l_SocketIOSockets) {
if (desc.second.EventInterface)
desc.second.EventInterface->m_PFD = &pfds[i];
pfds[i].fd = desc.first; pfds[i].fd = desc.first;
pfds[i].events = desc.second.Events; pfds[i].events = desc.second.Events;
pfds[i].revents = 0;
descriptors[i] = desc.second; descriptors[i] = desc.second;
i++; i++;
@ -185,7 +186,7 @@ void SocketEvents::WakeUpThread(bool wait)
* Constructor for the SocketEvents class. * Constructor for the SocketEvents class.
*/ */
SocketEvents::SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject) SocketEvents::SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject)
: m_FD(socket->GetFD()) : m_FD(socket->GetFD()), m_PFD(NULL)
{ {
boost::call_once(l_SocketIOOnceFlag, &SocketEvents::InitializeThread); boost::call_once(l_SocketIOOnceFlag, &SocketEvents::InitializeThread);
@ -250,6 +251,11 @@ void SocketEvents::ChangeEvents(int events)
return; return;
it->second.Events = events; it->second.Events = events;
if (m_PFD && boost::this_thread::get_id() == l_SocketIOThread.get_id())
m_PFD->events = events;
else
l_SocketIOFDChanged = true;
} }
WakeUpThread(); WakeUpThread();

5
lib/base/socketevents.hpp
View File

@ -23,6 +23,10 @@
#include "base/i2-base.hpp" #include "base/i2-base.hpp"
#include "base/socket.hpp" #include "base/socket.hpp"
#ifndef _WIN32
# include <poll.h>
#endif /* _WIN32 */
namespace icinga namespace icinga
{ {
@ -50,6 +54,7 @@ protected:
private: private:
SOCKET m_FD; SOCKET m_FD;
bool m_Events; bool m_Events;
pollfd *m_PFD;
static void InitializeThread(void); static void InitializeThread(void);
static void ThreadProc(void); static void ThreadProc(void);