diff --git a/lib/base/socketevents.cpp b/lib/base/socketevents.cpp index 0e2be5017..b967a345f 100644 --- a/lib/base/socketevents.cpp +++ b/lib/base/socketevents.cpp @@ -35,8 +35,6 @@ static SocketEventEngine *l_SocketIOEngine; int SocketEvents::m_NextID = 0; -INITIALIZE_ONCE(&SocketEvents::InitializeEngine); - void SocketEventEngine::Start() { for (int tid = 0; tid < SOCKET_IOTHREADS; tid++) { @@ -116,6 +114,8 @@ void SocketEvents::InitializeEngine() SocketEvents::SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject) : m_ID(m_NextID++), m_FD(socket->GetFD()), m_EnginePrivate(nullptr) { + boost::call_once(l_SocketIOOnceFlag, &SocketEvents::InitializeEngine); + Register(lifesupportObject); } diff --git a/lib/base/socketevents.hpp b/lib/base/socketevents.hpp index fce7eef86..360a03477 100644 --- a/lib/base/socketevents.hpp +++ b/lib/base/socketevents.hpp @@ -53,8 +53,6 @@ public: void *GetEnginePrivate() const; void SetEnginePrivate(void *priv); - static void InitializeEngine(); - protected: SocketEvents(const Socket::Ptr& socket, Object *lifesupportObject); @@ -66,6 +64,8 @@ private: static int m_NextID; + static void InitializeEngine(); + void WakeUpThread(bool wait = false); void Register(Object *lifesupportObject);