mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen-share: Fix invalid seat release

Browse Source 
This fixes the situation where screen share seat is not released upon
compositor shut down.

This will have a cascading side-effecting of resulting in an invalid libinput
device reference assert, like the following:

../src/libinput.c:2169: libinput_device_unref: Assertion
`device->refcount > 0' failed.

That happens because at compositor shutdown, the seat created by the
screen share module will *still* be acccesible in compositor instance
seat list, effectively resulting in an invalid unref for a non-existent
libinput device.

This patch rectifies that in such a way that upon compositor shut down
we release the seat in the screen share module which would implicitly
remove it from the compositor instance seat list.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
This commit is contained in:
Marius Vlad 2023-01-09 20:53:04 +02:00 committed by Derek Foreman
parent eee4efef68
commit bccc0273b2
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compositor/screen-share.c
View File

@ -55,6 +55,7 @@ struct shared_output {
struct weston_output *output;
struct wl_listener output_destroyed;
struct wl_list seat_list;
struct wl_list output_link; /** screen_share::output_list */
struct {
struct wl_display *display;
@ -117,6 +118,7 @@ struct ss_shm_buffer {
struct screen_share {
struct weston_compositor *compositor;
struct wl_listener compositor_destroy_listener;
struct wl_list output_list;
char *command;
};
@ -948,7 +950,7 @@ err_shared_output:
}
static struct shared_output *
shared_output_create(struct weston_output *output, int parent_fd)
shared_output_create(struct weston_output *output, struct screen_share *ss, int parent_fd)
{
struct shared_output *so;
struct wl_event_loop *loop;
@ -1037,6 +1039,8 @@ shared_output_create(struct weston_output *output, int parent_fd)
weston_output_disable_planes_incr(output);
weston_output_damage(output);
wl_list_insert(&ss->output_list, &so->output_link);
return so;
err_display:
@ -1054,6 +1058,7 @@ static void
shared_output_destroy(struct shared_output *so)
{
struct ss_shm_buffer *buffer, *bnext;
struct ss_seat *seat, *tmp;
weston_output_disable_planes_decr(so->output);
@ -1062,6 +1067,9 @@ shared_output_destroy(struct shared_output *so)
wl_list_for_each_safe(buffer, bnext, &so->shm.free_buffers, free_link)
ss_shm_buffer_destroy(buffer);
wl_list_for_each_safe(seat, tmp, &so->seat_list, link)
ss_seat_destroy(seat);
wl_display_disconnect(so->parent.display);
wl_event_source_remove(so->event_source);
@ -1075,7 +1083,7 @@ shared_output_destroy(struct shared_output *so)
}
static struct shared_output *
weston_output_share(struct weston_output *output, const char* command)
weston_output_share(struct weston_output *output, struct screen_share *ss)
{
int sv[2];
char str[32];
@ -1084,7 +1092,7 @@ weston_output_share(struct weston_output *output, const char* command)
char *const argv[] = {
"/bin/sh",
"-c",
(char*)command,
(char*)ss->command,
NULL
};
@ -1133,7 +1141,7 @@ weston_output_share(struct weston_output *output, const char* command)
abort();
} else {
close(sv[1]);
return shared_output_create(output, sv[0]);
return shared_output_create(output, ss, sv[0]);
}
return NULL;
@ -1176,15 +1184,19 @@ share_output_binding(struct weston_keyboard *keyboard,
return;
}
weston_output_share(output, ss->command);
weston_output_share(output, ss);
}
static void
compositor_destroy_listener(struct wl_listener *listener, void *data)
{
struct shared_output *so, *so_next;
struct screen_share *ss =
wl_container_of(listener, ss, compositor_destroy_listener);
wl_list_for_each_safe(so, so_next, &ss->output_list, output_link)
shared_output_destroy(so);
wl_list_remove(&ss->compositor_destroy_listener.link);
free(ss->command);
@ -1207,6 +1219,7 @@ wet_module_init(struct weston_compositor *compositor,
ss->compositor = compositor;
wl_list_init(&ss->compositor_destroy_listener.link);
wl_list_init(&ss->output_list);
ss->compositor_destroy_listener.notify = compositor_destroy_listener;
wl_signal_add(&compositor->destroy_signal, &ss->compositor_destroy_listener);
@ -1225,7 +1238,7 @@ wet_module_init(struct weston_compositor *compositor,
&start_on_startup, false);
if (start_on_startup) {
wl_list_for_each(output, &compositor->output_list, link)
weston_output_share(output, ss->command);
weston_output_share(output, ss);
}
return 0;