Merge pull request #659 from hyprwm/hyprctl-nopoll

hyprctl-nopoll

src/Compositor.cpp

@@ -245,7 +245,6 @@ void CCompositor::cleanup() {
 
     // end threads
     g_pEventManager->m_tThread = std::thread();
-    HyprCtl::tThread = std::thread();
 
     m_vWorkspaces.clear();
     m_vWindows.clear();
@@ -1719,25 +1718,6 @@ CWindow* CCompositor::getWindowByRegex(const std::string& regexp) {
     return nullptr;
 }
 
-wl_event_source* hyprCtlTickSource = nullptr;
-
-int hyprCtlTick(void* data) {
-    HyprCtl::tickHyprCtl();  // so that we dont get that race condition multithread bullshit
-
-    wl_event_source_timer_update(hyprCtlTickSource, 16); // tick it 60/s, should be enough.
-
-    return 0;
-}
-
-void CCompositor::startHyprCtlTick() {
-    if (hyprCtlTickSource)
-        return;
-
-    hyprCtlTickSource = wl_event_loop_add_timer(m_sWLEventLoop, hyprCtlTick, nullptr);
-
-    wl_event_source_timer_update(hyprCtlTickSource, 16);
-}
-
 void CCompositor::warpCursorTo(const Vector2D& pos) {
 
     // warpCursorTo should only be used for warps that

src/Compositor.hpp

@@ -166,11 +166,8 @@ public:
     void                    forceReportSizesToWindowsOnWorkspace(const int&);
     bool                    cursorOnReservedArea();
     
-
     std::string             explicitConfigPath;
 
-    void                    startHyprCtlTick();
-
 private:
     void                    initAllSignals();
     void                    setRandomSplash();   

src/debug/HyprCtl.cpp

@@ -721,9 +721,21 @@ std::string getReply(std::string request) {
     return "unknown request";
 }
 
-void HyprCtl::tickHyprCtl() {
+int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
-    if (!requestMade)
+    if (mask & WL_EVENT_ERROR || mask & WL_EVENT_HANGUP)
-        return;
+        return 0;
+
+    sockaddr_in clientAddress;
+    socklen_t clientSize = sizeof(clientAddress);
+
+    const auto ACCEPTEDCONNECTION = accept(HyprCtl::iSocketFD, (sockaddr*)&clientAddress, &clientSize);
+
+    char readBuffer[1024];
+
+    auto messageSize = read(ACCEPTEDCONNECTION, readBuffer, 1024);
+    readBuffer[messageSize == 1024 ? 1023 : messageSize] = '\0';
+
+    std::string request(readBuffer);
 
     std::string reply = "";
 
@@ -734,44 +746,22 @@ void HyprCtl::tickHyprCtl() {
         reply = "Err: " + std::string(e.what());
     }
 
-    request = reply;
+    write(ACCEPTEDCONNECTION, reply.c_str(), reply.length());
 
-    requestMade = false;
+    close(ACCEPTEDCONNECTION);
-    requestReady = true;
 
     if (g_pConfigManager->m_bWantsMonitorReload) {
         g_pConfigManager->ensureDPMS();
     }
-}
 
-std::string getRequestFromThread(std::string rq) {
+    return 0;
-    
-    while (HyprCtl::request != "" || HyprCtl::requestMade || HyprCtl::requestReady) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(5));
-    }
-
-    HyprCtl::request = rq;
-    HyprCtl::requestMade = true;
-
-    while (!HyprCtl::requestReady) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(5));
-    }
-
-    HyprCtl::requestReady = false;
-    HyprCtl::requestMade = false;
-
-    std::string toReturn = HyprCtl::request;
-
-    HyprCtl::request = "";
-
-    return toReturn;
 }
 
 void HyprCtl::startHyprCtlSocket() {
-    tThread = std::thread([&]() {
-        const auto SOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
 
-        if (SOCKET < 0) {
+    iSocketFD = socket(AF_UNIX, SOCK_STREAM, 0);
+
+    if (iSocketFD < 0) {
         Debug::log(ERR, "Couldn't start the Hyprland Socket. (1) IPC will not work.");
         return;
     }
@@ -782,40 +772,12 @@ void HyprCtl::startHyprCtlSocket() {
 
     strcpy(SERVERADDRESS.sun_path, socketPath.c_str());
 
-        bind(SOCKET, (sockaddr*)&SERVERADDRESS, SUN_LEN(&SERVERADDRESS));
+    bind(iSocketFD, (sockaddr*)&SERVERADDRESS, SUN_LEN(&SERVERADDRESS));
 
     // 10 max queued.
-        listen(SOCKET, 10);
+    listen(iSocketFD, 10);
-
-        sockaddr_in clientAddress;
-        socklen_t clientSize = sizeof(clientAddress);
-
-        char readBuffer[1024] = {0};
 
     Debug::log(LOG, "Hypr socket started at %s", socketPath.c_str());
 
-        while(1) {
+    wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, iSocketFD, WL_EVENT_READABLE, hyprCtlFDTick, nullptr);
-            const auto ACCEPTEDCONNECTION = accept(SOCKET, (sockaddr*)&clientAddress, &clientSize);
-
-            if (ACCEPTEDCONNECTION < 0) {
-                Debug::log(ERR, "Couldn't listen on the Hyprland Socket. (3) IPC will not work.");
-                break;
-            }
-
-            auto messageSize = read(ACCEPTEDCONNECTION, readBuffer, 1024);
-            readBuffer[messageSize == 1024 ? 1023 : messageSize] = '\0';
-
-            std::string request(readBuffer);
-
-            std::string reply = getRequestFromThread(request);
-            
-            write(ACCEPTEDCONNECTION, reply.c_str(), reply.length());
-
-            close(ACCEPTEDCONNECTION);
-        }
-
-        close(SOCKET);
-    });
-
-    tThread.detach();
 }

src/debug/HyprCtl.hpp

@@ -6,7 +6,6 @@
 
 namespace HyprCtl {
     void            startHyprCtlSocket();
-    void            tickHyprCtl();
 
     // very simple thread-safe request method
     inline  bool    requestMade = false;
@@ -15,7 +14,9 @@ namespace HyprCtl {
 
     inline std::ifstream requestStream;
 
-    inline std::thread tThread;
+    inline wl_event_source* hyprCtlTickSource = nullptr;
+
+    inline int      iSocketFD = -1;
 
     enum eHyprCtlOutputFormat {
         FORMAT_NORMAL = 0,

src/managers/ThreadManager.cpp

@@ -22,8 +22,6 @@ CThreadManager::CThreadManager() {
 
     HyprCtl::startHyprCtlSocket();
 
-    g_pCompositor->startHyprCtlTick();
-
     m_esConfigTimer = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, handleTimer, this);
 
     wl_event_source_timer_update(m_esConfigTimer, 1000);