mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: avoid recursive rescan

Browse source 
A rescan can trigger a new rescan and with a blocking rountrip this
can recursively never end. Catch a rescan while rescanning and queue
it for when we end the current scan.

Fixes #364
This commit is contained in:
Wim Taymans 2020-11-03 20:25:51 +01:00
parent 8ca71060eb
commit 4f2b1c7684
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/examples/media-session/media-session.c
View file

@ -143,6 +143,9 @@ struct impl {
int state_dir_fd; int state_dir_fd;
char state_dir[PATH_MAX]; char state_dir[PATH_MAX];
unsigned int scanning:1;
unsigned int rescan_pending:1;
}; };
struct endpoint_link { struct endpoint_link {
@ -1299,6 +1302,11 @@ int sm_media_session_for_each_object(struct sm_media_session *sess,
int sm_media_session_schedule_rescan(struct sm_media_session *sess) int sm_media_session_schedule_rescan(struct sm_media_session *sess)
{ {
struct impl *impl = SPA_CONTAINER_OF(sess, struct impl, this); struct impl *impl = SPA_CONTAINER_OF(sess, struct impl, this);
if (impl->scanning) {
impl->rescan_pending = true;
return impl->rescan_seq;
}
if (impl->policy_core) if (impl->policy_core)
impl->rescan_seq = pw_core_sync(impl->policy_core, 0, impl->last_seq); impl->rescan_seq = pw_core_sync(impl->policy_core, 0, impl->last_seq);
return impl->rescan_seq; return impl->rescan_seq;
@ -1936,8 +1944,16 @@ static void core_done(void *data, uint32_t id, int seq)
if (impl->rescan_seq == seq) { if (impl->rescan_seq == seq) {
struct sm_object *obj, *to; struct sm_object *obj, *to;
if (!impl->scanning) {
pw_log_trace(NAME" %p: rescan %u %d", impl, id, seq); pw_log_trace(NAME" %p: rescan %u %d", impl, id, seq);
impl->scanning = true;
sm_media_session_emit_rescan(impl, seq); sm_media_session_emit_rescan(impl, seq);
impl->scanning = false;
if (impl->rescan_pending) {
impl->rescan_pending = false;
sm_media_session_schedule_rescan(&impl->this);
}
}
spa_list_for_each_safe(obj, to, &impl->global_list, link) { spa_list_for_each_safe(obj, to, &impl->global_list, link) {
pw_log_trace(NAME" %p: obj %p %08x", impl, obj, obj->changed); pw_log_trace(NAME" %p: obj %p %08x", impl, obj, obj->changed);