wayland-deadlock #2
Merged
Conversation
This file contains 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
Currently, if a game using the linux_wayland backend loses focus, it
will deadlock with the following stack:
```
(gdb) bt
at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:38
... (omitted for brevity)
at src/lib.rs:506
data=0x7ffc4e5c5fb0, _toplevel=0x558428e38e40, width=800, height=600, _states=0x5584298b6770)
at src/native/linux_wayland.rs:508
...
from /lib/x86_64-linux-gnu/libwayland-client.so.0
...
```
What's happening here is that the wayland backend is holding onto the
mutex guard for the `native_display()` when it dispatches the resize
event to event listeners.
This hits the `EventHandler` impl for `Stage` in macroquad 0.4.13, which
attempts to re-lock the `native_display()` while it is already locked by
the wayland backend
https://docs.rs/crate/macroquad/0.4.13/source/src/lib.rs#506
The fix here is to guarantee that the native display is released before
dispatching events.
This looks like it was already done for the `payload.decorations`
codepath, but not for the event handlers. I can't see a motivation for
continuing to hold the lock past where we read the last data off the
display, so I've simply moved the manual drop up to always execute.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fork-local copy of not-fl3#508