From 6ddfae0a077b2659179c4bb2fc1ae0691b984ccc Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Wed, 2 Nov 2022 21:28:00 +0000 Subject: [PATCH] remove ensureFDsValid, legacy --- src/managers/EventManager.cpp | 23 ----------------------- src/managers/EventManager.hpp | 1 - 2 files changed, 24 deletions(-) diff --git a/src/managers/EventManager.cpp b/src/managers/EventManager.cpp index fd579ac0..e1b3d26b 100644 --- a/src/managers/EventManager.cpp +++ b/src/managers/EventManager.cpp @@ -72,8 +72,6 @@ void CEventManager::startThread() { // add to event loop so we can close it when we need to m_dAcceptedSocketFDs.push_back({ACCEPTEDCONNECTION, wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, ACCEPTEDCONNECTION, WL_EVENT_READABLE, fdHandleWrite, &m_dAcceptedSocketFDs)}); } - - ensureFDsValid(); } close(SOCKET); @@ -82,28 +80,7 @@ void CEventManager::startThread() { m_tThread.detach(); } -void CEventManager::ensureFDsValid() { - static char readBuf[1024] = {0}; - - // pong if all FDs valid - for (auto it = m_dAcceptedSocketFDs.begin(); it != m_dAcceptedSocketFDs.end();) { - auto sizeRead = recv(it->first, &readBuf, 1024, 0); - - if (sizeRead != 0) { - it++; - continue; - } - - // invalid! - Debug::log(LOG, "Removed invalid socket (2) FD: %d", *it); - it = m_dAcceptedSocketFDs.erase(it); - } -} - void CEventManager::flushEvents() { - - ensureFDsValid(); - eventQueueMutex.lock(); for (auto& ev : m_dQueuedEvents) { diff --git a/src/managers/EventManager.hpp b/src/managers/EventManager.hpp index 7cae4108..348e3361 100644 --- a/src/managers/EventManager.hpp +++ b/src/managers/EventManager.hpp @@ -26,7 +26,6 @@ public: private: void flushEvents(); - void ensureFDsValid(); std::mutex eventQueueMutex; std::deque m_dQueuedEvents;