mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove timerfd from loop implementation

Browse source 
timerfd doesn't work on the BSDs, so this replaces it with a timespec
for the expiry and uses a poll timeout to check the timers when needed.
This commit is contained in:
Ryan Dwyer 2018-10-14 12:28:38 +10:00
parent f98f351a52
commit 6921fdc6d6
7 changed files with 128 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
swaybar/bar.c
View file

@ -647,7 +647,7 @@ static void status_in(int fd, short mask, void *data) {
if (mask & (POLLHUP | POLLERR)) {
status_error(bar->status, "[error reading from status command]");
set_bar_dirty(bar);
loop_remove_event(bar->eventloop, bar->status_event);
loop_remove_fd(bar->eventloop, fd);
} else if (status_handle_readable(bar->status)) {
set_bar_dirty(bar);
}
@ -658,8 +658,8 @@ void bar_run(struct swaybar *bar) {
display_in, bar);
loop_add_fd(bar->eventloop, bar->ipc_event_socketfd, POLLIN, ipc_in, bar);
if (bar->status) {
bar->status_event = loop_add_fd(
bar->eventloop, bar->status->read_fd, POLLIN, status_in, bar);
loop_add_fd(bar->eventloop, bar->status->read_fd, POLLIN,
status_in, bar);
}
while (1) {
wl_display_flush(bar->display);