twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-08 08:01:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

socket2: fix events being reordered (#5955)

Browse Source 
* socket2: fix events being reordered

* remove WL_EVENT_READABLE

* initialize eventSource in SClient

* add more logs

oopsie

* replace unordered_map with vector

* fix reordering when socket becomes writable before queue is flushed

* ignore EAGAIN when accepting connection

* use g_pEventManager
This commit is contained in:
underengineering
2024-05-10 14:32:50 +03:00
committed by GitHub
parent c19903eaf8
commit 37a84c5223
3 changed files with 142 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/managers/EventManager.hpp
View File

@@ -1,10 +1,9 @@
#pragma once
#include <deque>
#include <fstream>
#include <mutex>
#include <vector>
#include "../defines.hpp"
#include "../helpers/MiscFunctions.hpp"
#include "../helpers/memory/SharedPtr.hpp"
struct SHyprIPCEvent {
std::string event;
@@ -14,27 +13,33 @@ struct SHyprIPCEvent {
class CEventManager {
public:
CEventManager();
~CEventManager();
void postEvent(const SHyprIPCEvent event);
void startThread();
std::thread m_tThread;
int m_iSocketFD = -1;
int onSocket2Write(int fd, uint32_t mask);
int onFDWrite(int fd, uint32_t mask);
void postEvent(const SHyprIPCEvent& event);
private:
void flushEvents();
std::string formatEvent(const SHyprIPCEvent& event) const;
std::mutex eventQueueMutex;
std::deque<SHyprIPCEvent> m_dQueuedEvents;
static int onServerEvent(int fd, uint32_t mask, void* data);
static int onClientEvent(int fd, uint32_t mask, void* data);
std::deque<std::pair<int, wl_event_source*>> m_dAcceptedSocketFDs;
int onServerEvent(int fd, uint32_t mask);
int onClientEvent(int fd, uint32_t mask);
wl_event_source* m_pEventSource = nullptr;
struct SClient {
int fd = -1;
std::deque<SP<std::string>> events;
wl_event_source* eventSource = nullptr;
};
std::vector<SClient>::iterator findClientByFD(int fd);
std::vector<SClient>::iterator removeClientByFD(int fd);
private:
int m_iSocketFD = -1;
wl_event_source* m_pEventSource = nullptr;
std::vector<SClient> m_vClients;
};
inline std::unique_ptr<CEventManager> g_pEventManager;