From: Lucas Stach Date: Tue, 28 May 2019 15:43:25 +0000 (+0200) Subject: gl/wayland: fix wayland event source burning CPU X-Git-Tag: 1.16.2~41 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=467656df0df9e6ade3808b90a4a4f9c549c14338;p=platform%2Fupstream%2Fgst-plugins-base.git gl/wayland: fix wayland event source burning CPU Commit c71dd72b "gl/wayland: fix glib mainloop integration" was overeager in removing the poll result test from the check function. This caused dispatch to be called even if no new events are available on the Wayland connection, which in turn would wake up the glib mainloop, causing effectively a tight loop without ever blocking on the poll. Fixes #603 --- diff --git a/gst-libs/gst/gl/wayland/wayland_event_source.c b/gst-libs/gst/gl/wayland/wayland_event_source.c index 3f9d482..553125e 100644 --- a/gst-libs/gst/gl/wayland/wayland_event_source.c +++ b/gst-libs/gst/gl/wayland/wayland_event_source.c @@ -151,8 +151,12 @@ wayland_event_source_check (GSource * base) source->reading = FALSE; - if (wl_display_read_events (source->display) == 0) - return TRUE; + if (source->pfd.revents & G_IO_IN) { + if (wl_display_read_events (source->display) == 0) + return TRUE; + } else { + wl_display_cancel_read (source->display); + } return FALSE; }