Merge branch 'fix_warning' into 'main'

compositor: Check for EINTR reading timerfd

See merge request wayland/weston!1923
This commit is contained in:
Derek Foreman 2025-12-16 16:00:21 -06:00
commit 766a1dac34

View file

@ -4156,8 +4156,14 @@ output_repaint_timer_handler(int fd, uint32_t mask, void *data)
struct timespec now;
int ret = 0;
uint64_t e;
ssize_t size;
read(compositor->repaint_timer_fd, &e, sizeof e);
do {
size = read(compositor->repaint_timer_fd, &e, sizeof e);
} while (size < 0 && errno == EINTR);
if (size < 0)
weston_log("repaint timer read failed: %s\n", strerror(errno));
/* We may have transactions with constraints that cleared after
* the last repaint. That repaint would have unconditionally