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

Rename the IOTHREADS macro 

refs #11014
This commit is contained in:
Gunnar Beutner 2016-02-16 13:30:55 +01:00
parent fd0aa4a290
commit 9313373447
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/base/socketevents.cpp
View File

@ -44,23 +44,28 @@ struct EventDescription
Object::Ptr LifesupportReference; Object::Ptr LifesupportReference;
}; };
#define IOTHREADS 8 #define SOCKET_IOTHREADS 8
static boost::once_flag l_SocketIOOnceFlag = BOOST_ONCE_INIT; static boost::once_flag l_SocketIOOnceFlag = BOOST_ONCE_INIT;
static boost::thread l_SocketIOThreads[IOTHREADS]; static boost::thread l_SocketIOThreads[SOCKET_IOTHREADS];
static SOCKET l_SocketIOEventFDs[IOTHREADS][2]; #ifdef __linux__
static boost::mutex l_SocketIOMutex[IOTHREADS]; static SOCKET l_SocketIOPollFDs[SOCKET_IOTHREADS];
static boost::condition_variable l_SocketIOCV[IOTHREADS]; #endif /* __linux__ */
static bool l_SocketIOFDChanged[IOTHREADS]; static SOCKET l_SocketIOEventFDs[SOCKET_IOTHREADS][2];
static std::map<SOCKET, SocketEventDescriptor> l_SocketIOSockets[IOTHREADS]; static bool l_SocketIOFDChanged[SOCKET_IOTHREADS];
static std::map<SOCKET, int> l_SocketIOEventChanges[IOTHREADS]; static boost::mutex l_SocketIOMutex[SOCKET_IOTHREADS];
static boost::condition_variable l_SocketIOCV[SOCKET_IOTHREADS];
static std::map<SOCKET, SocketEventDescriptor> l_SocketIOSockets[SOCKET_IOTHREADS];
int SocketEvents::m_NextID = 0; int SocketEvents::m_NextID = 0;
void SocketEvents::InitializeThread(void) void SocketEvents::InitializeThread(void)
{ {
for (int i = 0; i < SOCKET_IOTHREADS; i++) {
#ifdef __linux__
l_SocketIOPollFDs[i] = epoll_create1(EPOLL_CLOEXEC);
#endif /* __linux__ */
for (int i = 0; i < IOTHREADS; i++) {
Socket::SocketPair(l_SocketIOEventFDs[i]); Socket::SocketPair(l_SocketIOEventFDs[i]);
Utility::SetNonBlockingSocket(l_SocketIOEventFDs[i][0]); Utility::SetNonBlockingSocket(l_SocketIOEventFDs[i][0]);
@ -170,7 +175,7 @@ void SocketEvents::ThreadProc(int tid)
void SocketEvents::WakeUpThread(bool wait) void SocketEvents::WakeUpThread(bool wait)
{ {
int tid = m_ID % IOTHREADS; int tid = m_ID % SOCKET_IOTHREADS;
if (boost::this_thread::get_id() == l_SocketIOThreads[tid].get_id()) if (boost::this_thread::get_id() == l_SocketIOThreads[tid].get_id())
return; return;
@ -209,7 +214,7 @@ SocketEvents::~SocketEvents(void)
void SocketEvents::Register(Object *lifesupportObject) void SocketEvents::Register(Object *lifesupportObject)
{ {
int tid = m_ID % IOTHREADS; int tid = m_ID % SOCKET_IOTHREADS;
{ {
boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]); boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]);
@ -234,7 +239,7 @@ void SocketEvents::Register(Object *lifesupportObject)
void SocketEvents::Unregister(void) void SocketEvents::Unregister(void)
{ {
int tid = m_ID % IOTHREADS; int tid = m_ID % SOCKET_IOTHREADS;
{ {
boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]); boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]);
@ -255,14 +260,14 @@ void SocketEvents::Unregister(void)
void SocketEvents::ChangeEvents(int events) void SocketEvents::ChangeEvents(int events)
{ {
int tid = m_ID % IOTHREADS; if (m_FD == INVALID_SOCKET)
BOOST_THROW_EXCEPTION(std::runtime_error("Tried to read/write from a closed socket."));
int tid = m_ID % SOCKET_IOTHREADS;
{ {
boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]); boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]);
if (m_FD == INVALID_SOCKET)
BOOST_THROW_EXCEPTION(std::runtime_error("Tried to read/write from a closed socket."));
std::map<SOCKET, SocketEventDescriptor>::iterator it = l_SocketIOSockets[tid].find(m_FD); std::map<SOCKET, SocketEventDescriptor>::iterator it = l_SocketIOSockets[tid].find(m_FD);
if (it == l_SocketIOSockets[tid].end()) if (it == l_SocketIOSockets[tid].end())
@ -281,7 +286,7 @@ void SocketEvents::ChangeEvents(int events)
bool SocketEvents::IsHandlingEvents(void) const bool SocketEvents::IsHandlingEvents(void) const
{ {
int tid = m_ID % IOTHREADS; int tid = m_ID % SOCKET_IOTHREADS;
boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]); boost::mutex::scoped_lock lock(l_SocketIOMutex[tid]);
return m_Events; return m_Events;
} }