hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 15:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

synctimeline: move to CFileDescriptor

Browse source 
use CFileDescriptor in waiters.
This commit is contained in:
Tom Englund 2024-11-21 08:24:59 +01:00
parent 996bfa31fb
commit 97f1bd7c3e
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helpers/sync/SyncTimeline.cpp
View file

@ -85,10 +85,9 @@ bool CSyncTimeline::addWaiter(const std::function<void()>& waiter, uint64_t poin
auto w = makeShared<SWaiter>();
w->fn = waiter;
w->timeline = self;
w->fd = CFileDescriptor(eventfd(0, EFD_CLOEXEC));
int eventFD = eventfd(0, EFD_CLOEXEC);
if (eventFD < 0) {
if (!w->fd.isValid()) {
Debug::log(ERR, "CSyncTimeline::addWaiter: failed to acquire an eventfd");
return false;
}
@ -97,19 +96,17 @@ bool CSyncTimeline::addWaiter(const std::function<void()>& waiter, uint64_t poin
.handle = handle,
.flags = flags,
.point = point,
.fd = eventFD,
.fd = w->fd.get(),
};
if (drmIoctl(drmFD, DRM_IOCTL_SYNCOBJ_EVENTFD, &syncobjEventFD) != 0) {
Debug::log(ERR, "CSyncTimeline::addWaiter: drmIoctl failed");
close(eventFD);
return false;
}
w->source = wl_event_loop_add_fd(g_pEventLoopManager->m_sWayland.loop, eventFD, WL_EVENT_READABLE, ::handleWaiterFD, w.get());
w->source = wl_event_loop_add_fd(g_pEventLoopManager->m_sWayland.loop, w->fd.get(), WL_EVENT_READABLE, ::handleWaiterFD, w.get());
if (!w->source) {
Debug::log(ERR, "CSyncTimeline::addWaiter: wl_event_loop_add_fd failed");
close(eventFD);
return false;
}

1
src/helpers/sync/SyncTimeline.hpp
View file

@ -22,6 +22,7 @@ class CSyncTimeline {
struct SWaiter {
std::function<void()> fn;
wl_event_source* source = nullptr;
CFileDescriptor fd;
WP<CSyncTimeline> timeline;
};