isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland-outputs: Delay wl_output destruction

Browse Source 
This tries to avoid wayland clients getting disconnected for binding
to a wl_output that we already destroyed which is a known protocol
race condition, see https://phabricator.freedesktop.org/T7722 .

https://bugzilla.gnome.org/show_bug.cgi?id=789070
This commit is contained in:
Rui Matos 2017-12-06 17:05:02 +01:00
parent db32047a5d
commit 1923db97c1
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wayland/meta-wayland-outputs.c
View File

@ -259,6 +259,9 @@ bind_output (struct wl_client *client,
wl_resource_set_user_data (resource, wayland_output); wl_resource_set_user_data (resource, wayland_output);
wl_resource_set_destructor (resource, output_resource_destroy); wl_resource_set_destructor (resource, output_resource_destroy);
if (!logical_monitor)
return;
monitor = pick_main_monitor (logical_monitor); monitor = pick_main_monitor (logical_monitor);
meta_verbose ("Binding monitor %p/%s (%u, %u, %u, %u) x %f\n", meta_verbose ("Binding monitor %p/%s (%u, %u, %u, %u) x %f\n",
@ -361,6 +364,22 @@ meta_wayland_output_new (MetaWaylandCompositor *compositor,
return wayland_output; return wayland_output;
} }
static void
nullify_logical_monitor (gpointer key,
gpointer value,
gpointer data)
{
MetaWaylandOutput *wayland_output = value;
wayland_output->logical_monitor = NULL;
}
static gboolean
delayed_destroy_outputs (gpointer data)
{
g_hash_table_destroy (data);
return G_SOURCE_REMOVE;
}
static GHashTable * static GHashTable *
meta_wayland_compositor_update_outputs (MetaWaylandCompositor *compositor, meta_wayland_compositor_update_outputs (MetaWaylandCompositor *compositor,
MetaMonitorManager *monitor_manager) MetaMonitorManager *monitor_manager)
@ -401,7 +420,9 @@ meta_wayland_compositor_update_outputs (MetaWaylandCompositor *compositor,
wayland_output); wayland_output);
} }
g_hash_table_destroy (compositor->outputs); g_hash_table_foreach (compositor->outputs, nullify_logical_monitor, NULL);
g_timeout_add_seconds (10, delayed_destroy_outputs, compositor->outputs);
return new_table; return new_table;
} }