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

Revert "Initialize Socket Event Engine on application startup"

Browse Source 
This reverts commit c8dcd1297f6d0be8685c5a3079e40fc44e779add.

We cannot do this during application startup, since Daemonize()
kills the threads again.

refs #6514
refs #6630
This commit is contained in:
Michael Friedrich 2018-10-09 19:38:29 +02:00
parent 13c75b7113
commit 4be9f418a9
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,8 +35,6 @@ 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++) {
@ -116,6 +114,8 @@ 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,8 +53,6 @@ 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);
@ -66,6 +64,8 @@ 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);