Skip to content
GitLab
Commit e14bb5fa authored by Julian Bouzas's avatar Julian Bouzas
Browse files

modules: steal the format_task before returning it 

Fixes possible race condition when setting adapter ports format in the callback
of a previous adapter ports format call.
parent 20a2f5a2
Hide whitespace changes
Inline Side-by-side
modules/module-si-audio-adapter.c
View file @ e14bb5fa
......@@ -337,17 +337,17 @@ on_sync_done (WpCore * core, GAsyncResult * res, WpSiAudioAdapter *self)
guint32 active = 0;
if (!wp_core_sync_finish (core, res, &error)) {
g_task_return_error (self->format_task, g_steal_pointer (&error));
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_error (t, g_steal_pointer (&error));
return;
}
active = wp_object_get_active_features (WP_OBJECT (self->node));
if (!(active & WP_NODE_FEATURE_PORTS)) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_OPERATION_FAILED,
"node feature ports is not enabled, aborting set format operation");
g_clear_object (&self->format_task);
return;
}
......@@ -359,8 +359,8 @@ on_sync_done (WpCore * core, GAsyncResult * res, WpSiAudioAdapter *self)
/* make sure ports are available */
if (wp_node_get_n_ports (self->node) > 0) {
g_task_return_boolean (self->format_task, TRUE);
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_boolean (t, TRUE);
} else {
wp_core_sync (core, NULL, (GAsyncReadyCallback) on_sync_done, self);
}
......@@ -454,9 +454,9 @@ si_audio_adapter_set_ports_format (WpSiAdapter * item, WpSpaPod *format,
/* cancel previous task if any */
if (self->format_task) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_INVARIANT, "setting new format before previous done");
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_INVARIANT,
"setting new format before previous done");
}
/* create the new task */
......@@ -466,9 +466,9 @@ si_audio_adapter_set_ports_format (WpSiAdapter * item, WpSpaPod *format,
/* build new format */
new_format = build_adapter_format (self, format);
if (!new_format) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_INVARIANT, "failed to parse format");
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_INVARIANT,
"failed to parse format");
return;
}
......
modules/module-si-audio-endpoint.c
View file @ e14bb5fa
......@@ -70,10 +70,10 @@ si_audio_endpoint_reset (WpSessionItem * item)
self->priority = 0;
g_clear_object (&self->session);
if (self->format_task) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_OPERATION_FAILED,
"item deactivated before format set");
g_clear_object (&self->format_task);
}
g_clear_pointer (&self->format, wp_spa_pod_unref);
self->mode[0] = '\0';
......@@ -391,17 +391,17 @@ on_sync_done (WpCore * core, GAsyncResult * res, WpSiAudioEndpoint *self)
guint32 active = 0;
if (!wp_core_sync_finish (core, res, &error)) {
g_task_return_error (self->format_task, g_steal_pointer (&error));
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_error (t, g_steal_pointer (&error));
return;
}
active = wp_object_get_active_features (WP_OBJECT (self->node));
if (!(active & WP_NODE_FEATURE_PORTS)) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_OPERATION_FAILED,
"node feature ports is not enabled, aborting set format operation");
g_clear_object (&self->format_task);
return;
}
......@@ -413,8 +413,8 @@ on_sync_done (WpCore * core, GAsyncResult * res, WpSiAudioEndpoint *self)
/* make sure ports are available */
if (wp_node_get_n_ports (self->node) > 0) {
g_task_return_boolean (self->format_task, TRUE);
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_boolean (t, TRUE);
} else {
wp_core_sync (core, NULL, (GAsyncReadyCallback) on_sync_done, self);
}
......@@ -508,9 +508,9 @@ si_audio_endpoint_set_ports_format (WpSiAdapter * item, WpSpaPod *format,
/* cancel previous task if any */
if (self->format_task) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_INVARIANT, "setting new format before previous done");
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_INVARIANT,
"setting new format before previous done");
}
/* create the new task */
......@@ -520,9 +520,9 @@ si_audio_endpoint_set_ports_format (WpSiAdapter * item, WpSpaPod *format,
/* build new format */
new_format = build_adapter_format (self, format);
if (!new_format) {
g_task_return_new_error (self->format_task, WP_DOMAIN_LIBRARY,
WP_LIBRARY_ERROR_INVARIANT, "failed to parse format");
g_clear_object (&self->format_task);
g_autoptr (GTask) t = g_steal_pointer (&self->format_task);
g_task_return_new_error (t, WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_INVARIANT,
"failed to parse format");
return;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment