mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve error handling

Browse source
This commit is contained in:
Wim Taymans 2019-06-18 10:47:12 -04:00
parent c30d938034
commit 5850044599
6 changed files with 45 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spa/plugins/support/loop.c
View file

@ -727,6 +727,7 @@ impl_init(const struct spa_handle_factory *factory,
{
struct impl *impl;
uint32_t i;
int res;
spa_return_val_if_fail(factory != NULL, -EINVAL);
spa_return_val_if_fail(handle != NULL, -EINVAL);
@ -760,12 +761,16 @@ impl_init(const struct spa_handle_factory *factory,
}
if (impl->system == NULL) {
spa_log_error(impl->log, NAME " %p: a System is needed", impl);
return -EINVAL;
res = -EINVAL;
goto err;
}
impl->poll_fd = spa_system_pollfd_create(impl->system, SPA_FD_CLOEXEC);
if (impl->poll_fd < 0)
return errno;
if (impl->poll_fd < 0) {
res = -errno;
spa_log_error(impl->log, NAME " %p: can't create pollfd: %m", impl);
goto err;
}
spa_list_init(&impl->source_list);
spa_list_init(&impl->destroy_list);
@ -774,12 +779,28 @@ impl_init(const struct spa_handle_factory *factory,
spa_ringbuffer_init(&impl->buffer);
impl->wakeup = loop_add_event(impl, wakeup_func, impl);
if (impl->wakeup == NULL) {
res = -errno;
spa_log_error(impl->log, NAME " %p: can't create wakeup event: %m", impl);
goto err_free_poll;
}
impl->ack_fd = spa_system_eventfd_create(impl->system,
SPA_FD_EVENT_SEMAPHORE | SPA_FD_CLOEXEC);
if (impl->ack_fd < 0) {
res = -errno;
spa_log_error(impl->log, NAME " %p: can't create ack event: %m", impl);
goto err_free_wakeup;
}
spa_log_debug(impl->log, NAME " %p: initialized", impl);
return 0;
err_free_wakeup:
loop_destroy_source(impl, impl->wakeup);
err_free_poll:
spa_system_close(impl->system, impl->poll_fd);
err:
return res;
}
static const struct spa_interface_info impl_interfaces[] = {