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

Initialize Socket Event Engine on application startup 

Previously this happened inside the TlsStream constructor
during the first connection attempt.
This commit is contained in:
Michael Friedrich 2018-09-24 15:50:59 +02:00
parent eee4426dcb
commit c8dcd1297f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/socketevents.cpp
View File

@ -35,6 +35,8 @@ static SocketEventEngine *l_SocketIOEngine;
int SocketEvents::m_NextID = 0; int SocketEvents::m_NextID = 0;
INITIALIZE_ONCE(&SocketEvents::InitializeEngine);
void SocketEventEngine::Start() void SocketEventEngine::Start()
{ {
for (int tid = 0; tid < SOCKET_IOTHREADS; tid++) { for (int tid = 0; tid < SOCKET_IOTHREADS; tid++) {
@ -114,8 +116,6 @@ void SocketEvents::InitializeEngine()
SocketEvents::SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject) SocketEvents::SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject)
: m_ID(m_NextID++), m_FD(socket->GetFD()), m_EnginePrivate(nullptr) : m_ID(m_NextID++), m_FD(socket->GetFD()), m_EnginePrivate(nullptr)
{ {
boost::call_once(l_SocketIOOnceFlag, &SocketEvents::InitializeEngine);
Register(lifesupportObject); Register(lifesupportObject);
} }

4
lib/base/socketevents.hpp
View File

@ -53,6 +53,8 @@ public:
void *GetEnginePrivate() const; void *GetEnginePrivate() const;
void SetEnginePrivate(void *priv); void SetEnginePrivate(void *priv);
static void InitializeEngine();
protected: protected:
SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject); SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject);
@ -64,8 +66,6 @@ private:
static int m_NextID; static int m_NextID;
static void InitializeEngine();
void WakeUpThread(bool wait = false); void WakeUpThread(bool wait = false);
void Register(Object *lifesupportObject); void Register(Object *lifesupportObject);