lkn
/
windowmaker-wl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: call wl_display_destroy on close so restart works (stale socket was preventing execvp from re-binding)

This commit is contained in:
lkn 2026-06-06 11:06:59 +02:00
parent 1045bd6a77
commit 1c6c9d6e66
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/wayland/wl_backend.c
View File

@ -879,27 +879,20 @@ wl_display_close(void)
wl_state.cursor = NULL;
}
/* Skip wl_display_destroy() and wl_display_destroy_clients().
/* Tear down the Wayland display so the compositor socket is removed.
* Without this, restart (execvp) fails because the new instance finds
* a stale socket at $XDG_RUNTIME_DIR/wayland-N and refuses to start.
*
* wl_display_destroy() fires the display's destroy signal which triggers
* wlroots 0.15 internal object teardown. That teardown has a double-
* remove bug in the XWayland path: wlroots registers a listener on the
* Xwayland wl_client's destroy signal; that listener self-removes during
* client destruction, and wlr_xwayland_server_destroy() then tries to
* wl_list_remove() the already-nulled link, corrupting the heap
* (SIGABRT).
* The XWayland server was SIGKILL'd above and server->client was
* NULL'd to prevent wlr_xwayland_server_destroy from double-freeing
* the wl_client during display destroy signal dispatch.
*
* wl_display_destroy_clients() also blocks: wlroots' XWayland client
* destroy handler performs blocking cleanup that can hang if Xwayland
* is in the middle of protocol dispatch.
*
* Both calls are unnecessary here because Exit() calls exit(0) immediately
* after wl_display_close() returns. The kernel reclaims all resources:
* - file descriptors closed → all Wayland clients get POLLHUP
* - memory freed by OS
* - Xwayland already SIGKILL'd in step 1
* - event sources removed in step 2
* - all our signal listeners removed in step 3 */
* All remaining listeners were removed in the WL_LISTENER_REMOVE block
* above, so no dangling signal handlers remain. */
wlr_backend_destroy(wl_state.backend);
wl_state.backend = NULL;
wl_display_destroy_clients(wl_state.display);
wl_display_destroy(wl_state.display);
unsetenv("WAYLAND_DISPLAY");
wl_state.renderer = NULL;
wl_state.backend = NULL;