Do proper wayland teardown cleaning up listeners and fds#2066
Open
3v1n0 wants to merge 8 commits into
Open
Conversation
3v1n0
changed the title
3v1n0
force-pushed
the
disconnect-from-signals
branch
from
ed8b88b to
863aaca
Compare
4 tasks
emersion
reviewed
Feb 7, 2026
emersion
reviewed
Feb 7, 2026
emersion
reviewed
Feb 7, 2026
emersion
reviewed
Feb 7, 2026
emersion
reviewed
Feb 7, 2026
Collaborator
|
@3v1n0, any chance you'd get some time to have a look at this PR? |
|
ping @3v1n0 |
|
Friendly ping @3v1n0 ALT Linux is on the way to drop libwlroots 0.18 from testing (sisyphus) repo. Was able to build gamescope with patches but would really appreciate proper upstream support. |
|
Marco probably busy with soon to be released Ubuntu 26.04 @emersion Could gamescope skip 0.19 and jump straight to 0.20? I tried building Debian package with libwlroots 0.20 (with patches from this PR) and in my quick testing it was ok |
3v1n0
force-pushed
the
disconnect-from-signals
branch
from
863aaca to
0f0ddc0
Compare
Author
|
Sorry for the delay, I think I handled the main things, let me know |
If we do not do this newer wlroots would rightly assert every time that
a surface gets closed with:
gamescope: types/wlr_compositor.c:734:
surface_handle_resource_destroy:
Assertion `wl_list_empty(&surface->events.commit.listener_list)'
failed.
gamescope: types/wlr_compositor.c:737:
surface_handle_resource_destroy:
Assertion `wl_list_empty(&surface->events.destroy.listener_list)'
failed.
Prevents:
gamescope: xwayland/server.c:462: wlr_xwayland_server_destroy:
Assertion `wl_list_empty(&server->events.ready.listener_list)' failed
Starting from wlroots 0.19 all these would trigger assertion errors
Destroy the event signals handlers on shutdown
Avoid heap-allocating the listener with new; embed it directly in the wlserver_t struct instead.
We were not closing the KMS session on destruction since the DRM FD might be still being polled by the page-flip thread. Handle this gracefully now by: - Create a pipe - Pass the pipe to the thread - Make the thread to repeatedly and atomically check if it should exit When we're about to finish the drm backend: - Mark the thread as thread as completed - Close the pipe write end to signal the thread that we're done - Join the thread to wait its completion - Finally close KMS on wayland side and unset the drm fd This allows to finally close all the remaining resources or signal connections that we created on wayland side
3v1n0
force-pushed
the
disconnect-from-signals
branch
from
0f0ddc0 to
baf810e
Compare
emersion
reviewed
May 31, 2026
| if ( wlserver.wlr.session ) | ||
| { | ||
| wl_list_remove( &wlserver.session_active.link ); | ||
| wlr_session_destroy( wlserver.wlr.session ); |
Collaborator
There was a problem hiding this comment.
This commit causes a SIGSEGV on exit for me in libseat.
Do we really need it? The session will destroy itself automatically with wl_display_destroy().
Collaborator
|
With the commit mentioned above reverted, this branch works well for me! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In debian we're already using wlroots-0.19, but with it every time a client window is closed or when gamescope itself is closed, we crash with an assertion error.
So remove event listeners (helping #1990) and close the drm FD, ensuring that the page-flip thread is completed.
See commits for details.