seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #111493 from deralmas/racing-the-thread

Browse Source 
Wayland: Defer event thread initialization to late initialization
This commit is contained in:
Thaddeus Crews
2025-11-06 08:13:13 -06:00
parent 659df25c97 ab205a78ce
commit 2d7380c3ff
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@ -3057,6 +3057,11 @@ void WaylandThread::_poll_events_thread(void *p_data) {
// Note that the main thread can still call wl_display_roundtrip as that // Note that the main thread can still call wl_display_roundtrip as that
// method directly handles all events, effectively bypassing this polling // method directly handles all events, effectively bypassing this polling
// loop and thus the mutex locking, avoiding a deadlock. // loop and thus the mutex locking, avoiding a deadlock.
//
// WARNING: Never call `wl_display_roundtrip` inside event handlers or while
// this mutex isn't held! `wl_display_roundtrip` manually handles new events
// and if not properly gated it _will_ cause potentially stall-inducing race
// conditions. Ask me how I know.
MutexLock mutex_lock(data->mutex); MutexLock mutex_lock(data->mutex);
if (wl_display_dispatch_pending(data->wl_display) == -1) { if (wl_display_dispatch_pending(data->wl_display) == -1) {
@ -4445,8 +4450,6 @@ Error WaylandThread::init() {
thread_data.wl_display = wl_display; thread_data.wl_display = wl_display;
events_thread.start(_poll_events_thread, &thread_data);
wl_registry = wl_display_get_registry(wl_display); wl_registry = wl_display_get_registry(wl_display);
ERR_FAIL_NULL_V_MSG(wl_registry, ERR_UNAVAILABLE, "Can't obtain the Wayland registry global."); ERR_FAIL_NULL_V_MSG(wl_registry, ERR_UNAVAILABLE, "Can't obtain the Wayland registry global.");
@ -4525,6 +4528,8 @@ Error WaylandThread::init() {
// Update the cursor. // Update the cursor.
cursor_set_shape(DisplayServer::CURSOR_ARROW); cursor_set_shape(DisplayServer::CURSOR_ARROW);
events_thread.start(_poll_events_thread, &thread_data);
initialized = true; initialized = true;
return OK; return OK;
} }