aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-24 18:31:14 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-24 18:38:56 +0000
commitbcd28311f4e2625ae45a21bbcd1817cdcf5ce5f3 (patch)
treed1c17fa26e5a8a35e3c088a5a9c327a66ca946f6 /wayland.c
parentdoc: meson: no need to check for scdoc again (diff)
wayland: prevent hang when terminating due to broken Wayland connection
If the call to fdm_wayl() with EPOLLHUP was followed by calls to wayl_roundtrip(), foot would hang. The reason for this is that the EPOLLHUP handler in fdm_wayl() would call wl_display_cancel_read(). wayl_roundtrip() also calls wl_display_cancel_read() (since we normally have called wl_display_prepare_read()), before calling wl_display_roundtrip(). When calling wl_display_cancel_read() two times in a row, without a wl_display_prepare_read() in between, wl_display_roundtrip() hangs. Fix by not calling wl_display_cancel_read() in fdm_wayl(). This ensures our invariant holds: wl_display_prepare_read() is *always* in effect outside of fdm_wayl(). Closes #651
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/wayland.c b/wayland.c
index a83ef59d..7e9ba629 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1163,7 +1163,15 @@ fdm_wayl(struct fdm *fdm, int fd, int events, void *data)
if (events & EPOLLHUP) {
LOG_WARN("disconnected from Wayland");
- wl_display_cancel_read(wayl->display);
+ /*
+ * Do *not* call wl_display_cancel_read() here.
+ *
+ * Doing so causes later calls to wayl_roundtrip() (called
+ * from term_destroy() -> wayl_win_destroy()) to hang
+ * indefinitely.
+ *
+ * https://codeberg.org/dnkl/foot/issues/651
+ */
return false;
}