From e1e154c7377779377fa1a36655a10effd693f7b5 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 17 Jun 2013 18:11:08 +0530 Subject: [PATCH] zeroconf: Fix pa_mainloop_api_once usage We need the mainloop lock to be taken around pa_mainloop_api_once() to prevent an assert due to the defer event creation and setting of the destroy callback not being performed atomically. --- src/modules/module-zeroconf-publish.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c index f96d4ce8..b76a215c 100644 --- a/src/modules/module-zeroconf-publish.c +++ b/src/modules/module-zeroconf-publish.c @@ -456,8 +456,11 @@ static pa_hook_result_t device_new_or_changed_cb(pa_core *c, pa_object *o, struc pa_assert(c); pa_object_assert_ref(o); - if (!shall_ignore(o)) + if (!shall_ignore(o)) { + pa_threaded_mainloop_lock(u->mainloop); pa_mainloop_api_once(u->api, publish_service, get_service(u, o)); + pa_threaded_mainloop_unlock(u->mainloop); + } return PA_HOOK_OK; } @@ -575,12 +578,18 @@ static int publish_all_services(struct userdata *u) { pa_log_debug("Publishing services in Zeroconf"); for (sink = PA_SINK(pa_idxset_first(u->core->sinks, &idx)); sink; sink = PA_SINK(pa_idxset_next(u->core->sinks, &idx))) - if (!shall_ignore(PA_OBJECT(sink))) + if (!shall_ignore(PA_OBJECT(sink))) { + pa_threaded_mainloop_lock(u->mainloop); pa_mainloop_api_once(u->api, publish_service, get_service(u, PA_OBJECT(sink))); + pa_threaded_mainloop_unlock(u->mainloop); + } for (source = PA_SOURCE(pa_idxset_first(u->core->sources, &idx)); source; source = PA_SOURCE(pa_idxset_next(u->core->sources, &idx))) - if (!shall_ignore(PA_OBJECT(source))) + if (!shall_ignore(PA_OBJECT(source))) { + pa_threaded_mainloop_lock(u->mainloop); pa_mainloop_api_once(u->api, publish_service, get_service(u, PA_OBJECT(source))); + pa_threaded_mainloop_unlock(u->mainloop); + } if (publish_main_service(u) < 0) goto fail; @@ -755,7 +764,10 @@ int pa__init(pa_module*m) { pa_threaded_mainloop_set_name(u->mainloop, "avahi-ml"); pa_threaded_mainloop_start(u->mainloop); + + pa_threaded_mainloop_lock(u->mainloop); pa_mainloop_api_once(u->api, create_client, u); + pa_threaded_mainloop_unlock(u->mainloop); pa_modargs_free(ma); -- 2.39.2