cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eventloop: RAII the even source on readable fd

Browse source 
RAII remove the event source and honor rule by 5
This commit is contained in:
Tom Englund 2025-07-03 21:20:46 +02:00 • committed by Vaxry
parent ceec1943ff
commit 4a30e2acd9
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/managers/eventLoop/EventLoopManager.cpp
View file

@ -77,11 +77,6 @@ void CEventLoopManager::onFdReadable(SReadableWaiter* waiter) {
UP<SReadableWaiter> taken = std::move(*it); UP<SReadableWaiter> taken = std::move(*it);
m_readableWaiters.erase(it); m_readableWaiters.erase(it);
if (taken->source) {
wl_event_source_remove(taken->source);
taken->source = nullptr;
}
if (taken->fn) if (taken->fn)
taken->fn(); taken->fn();
} }

17
src/managers/eventLoop/EventLoopManager.hpp
View file

@ -42,6 +42,23 @@ class CEventLoopManager {
wl_event_source* source; wl_event_source* source;
Hyprutils::OS::CFileDescriptor fd; Hyprutils::OS::CFileDescriptor fd;
std::function<void()> fn; std::function<void()> fn;
SReadableWaiter(wl_event_source* src, Hyprutils::OS::CFileDescriptor f, std::function<void()> func) : source(src), fd(std::move(f)), fn(std::move(func)) {}
~SReadableWaiter() {
if (source) {
wl_event_source_remove(source);
source = nullptr;
}
}
// copy
SReadableWaiter(const SReadableWaiter&) = delete;
SReadableWaiter& operator=(const SReadableWaiter&) = delete;
// move
SReadableWaiter(SReadableWaiter&& other) noexcept = default;
SReadableWaiter& operator=(SReadableWaiter&& other) noexcept = default;
}; };
// schedule function to when fd is readable (WL_EVENT_READABLE / POLLIN), // schedule function to when fd is readable (WL_EVENT_READABLE / POLLIN),