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

improve error handling some more

Browse source
This commit is contained in:
Wim Taymans 2019-06-20 11:04:34 +02:00
parent d1241e2c1c
commit a212d2f9ed
30 changed files with 393 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-access.c
View file

@ -186,8 +186,6 @@ core_check_access(void *data, struct pw_client *client)
pw_resource_error(pw_client_get_core_resource(client), res, "blacklisted");
pw_client_update_properties(client, &SPA_DICT_INIT(items, 1));
return;
}
static const struct pw_core_events core_events = {

49
src/modules/module-audio-dsp.c
View file

@ -47,7 +47,6 @@ static const struct spa_dict_item module_props[] = {
struct factory_data {
struct pw_factory *this;
struct pw_properties *properties;
struct spa_list node_list;
@ -103,19 +102,20 @@ static void *create_object(void *_data,
struct pw_resource *bound_resource;
if (resource == NULL)
goto no_resource;
goto error_resource;
client = pw_resource_get_client(resource);
dsp = pw_audio_dsp_new(pw_module_get_core(d->module),
properties,
sizeof(struct node_data));
properties = NULL;
if (dsp == NULL) {
if (errno == ENOMEM)
goto no_mem;
goto error_no_mem;
else
goto usage;
goto error_usage;
}
nd = pw_audio_dsp_get_user_data(dsp);
@ -129,38 +129,39 @@ static void *create_object(void *_data,
res = pw_global_bind(pw_node_get_global(dsp), client,
PW_PERM_RWX, PW_VERSION_NODE_PROXY, new_id);
if (res < 0)
goto no_bind;
goto error_bind;
if ((bound_resource = pw_client_find_resource(client, new_id)) == NULL)
goto no_bind;
goto error_bind;
pw_resource_add_listener(bound_resource, &nd->resource_listener, &resource_events, nd);
pw_node_set_active(dsp, true);
if (properties)
pw_properties_free(properties);
return dsp;
no_resource:
error_resource:
res = -EINVAL;
pw_log_error("audio-dsp needs a resource");
pw_resource_error(resource, -EINVAL, "no resource");
goto done;
usage:
pw_resource_error(resource, res, "no resource");
goto error_cleanup;
error_no_mem:
res = -errno;
pw_log_error("can't create node: %m");
pw_resource_error(resource, res, "no memory");
goto error_cleanup;
error_usage:
res = -EINVAL;
pw_log_error("usage: "AUDIO_DSP_USAGE);
pw_resource_error(resource, -EINVAL, "usage: "AUDIO_DSP_USAGE);
goto done;
no_mem:
pw_log_error("can't create node");
pw_resource_error(resource, -ENOMEM, "no memory");
goto done;
no_bind:
pw_resource_error(resource, res, "usage: "AUDIO_DSP_USAGE);
goto error_cleanup;
error_bind:
pw_resource_error(resource, res, "can't bind dsp node");
goto done;
done:
goto error_cleanup;
error_cleanup:
if (properties)
pw_properties_free(properties);
errno = -res;
return NULL;
}
@ -179,9 +180,6 @@ static void module_destroy(void *data)
spa_list_for_each_safe(nd, t, &d->node_list, link)
pw_node_destroy(nd->dsp);
if (d->properties)
pw_properties_free(d->properties);
pw_factory_destroy(d->this);
}
@ -210,7 +208,6 @@ static int module_init(struct pw_module *module, struct pw_properties *propertie
data = pw_factory_get_user_data(factory);
data->this = factory;
data->module = module;
data->properties = properties;
spa_list_init(&data->node_list);
pw_log_debug("module %p: new", module);

41
src/modules/module-audio-dsp/audio-dsp.c
View file

@ -257,37 +257,34 @@ static const struct pw_node_events node_events = {
};
struct pw_node *pw_audio_dsp_new(struct pw_core *core,
const struct pw_properties *props,
struct pw_properties *props,
size_t user_data_size)
{
struct pw_node *node;
struct node *n;
const char *api, *alias, *str, *factory;
char node_name[128];
struct pw_properties *pr;
enum pw_direction direction;
uint32_t max_buffer_size;
int i;
int i, res = -ENOENT;
pr = pw_properties_copy(props);
if ((str = pw_properties_get(pr, "audio-dsp.direction")) == NULL) {
if ((str = pw_properties_get(props, "audio-dsp.direction")) == NULL) {
pw_log_error("missing audio-dsp.direction property");
goto error;
}
direction = pw_properties_parse_int(str);
if ((str = pw_properties_get(pr, "audio-dsp.maxbuffer")) == NULL) {
if ((str = pw_properties_get(props, "audio-dsp.maxbuffer")) == NULL) {
pw_log_error("missing audio-dsp.maxbuffer property");
goto error;
}
max_buffer_size = pw_properties_parse_int(str);
if ((api = pw_properties_get(pr, PW_KEY_DEVICE_API)) == NULL) {
if ((api = pw_properties_get(props, PW_KEY_DEVICE_API)) == NULL) {
pw_log_error("missing "PW_KEY_DEVICE_API" property");
goto error;
}
if ((alias = pw_properties_get(pr, "audio-dsp.name")) == NULL) {
if ((alias = pw_properties_get(props, "audio-dsp.name")) == NULL) {
pw_log_error("missing audio-dsp.name property");
goto error;
}
@ -298,34 +295,36 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
node_name[i] = '_';
}
pw_properties_set(pr,
pw_properties_set(props,
PW_KEY_MEDIA_CLASS,
direction == PW_DIRECTION_OUTPUT ?
"Audio/DSP/Playback" :
"Audio/DSP/Capture");
pw_properties_set(pr, PW_KEY_NODE_DRIVER, NULL);
pw_properties_set(props, PW_KEY_NODE_DRIVER, NULL);
if ((str = pw_properties_get(pr, PW_KEY_NODE_ID)) != NULL)
pw_properties_set(pr, PW_KEY_NODE_SESSION, str);
if ((str = pw_properties_get(props, PW_KEY_NODE_ID)) != NULL)
pw_properties_set(props, PW_KEY_NODE_SESSION, str);
if (direction == PW_DIRECTION_OUTPUT) {
pw_properties_set(pr, "merger.monitor", "1");
pw_properties_set(props, "merger.monitor", "1");
factory = "merge";
} else {
factory = "split";
}
pw_properties_set(pr, "factory.mode", factory);
pw_properties_set(props, "factory.mode", factory);
factory = "audioconvert";
pw_properties_set(pr, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
pw_properties_set(props, SPA_KEY_LIBRARY_NAME, "audioconvert/libspa-audioconvert");
node = pw_spa_node_load(core, NULL, NULL,
factory,
node_name,
PW_SPA_NODE_FLAG_ACTIVATE | PW_SPA_NODE_FLAG_NO_REGISTER,
pr, sizeof(struct node) + user_data_size);
pw_properties_copy(props),
sizeof(struct node) + user_data_size);
if (node == NULL) {
pw_log_error("can't load spa node");
res = -errno;
pw_log_error("can't load spa node: %m");
goto error;
}
@ -333,7 +332,7 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
n->core = core;
n->node = node;
n->direction = direction;
n->props = pw_properties_copy(pr);
n->props = props;
spa_list_init(&n->ports);
n->max_buffer_size = max_buffer_size;
@ -346,7 +345,9 @@ struct pw_node *pw_audio_dsp_new(struct pw_core *core,
return node;
error:
pw_properties_free(pr);
if (props)
pw_properties_free(props);
errno = -res;
return NULL;
}

2
src/modules/module-audio-dsp/audio-dsp.h
View file

@ -40,7 +40,7 @@ extern "C" {
struct pw_node *
pw_audio_dsp_new(struct pw_core *core,
const struct pw_properties *properties,
struct pw_properties *properties,
size_t user_data_size);
void *pw_audio_dsp_get_user_data(struct pw_node *node);

1
src/modules/module-client-node.c
View file

@ -99,6 +99,7 @@ error_node:
pw_log_error("can't create node: %s", spa_strerror(res));
pw_resource_error(resource, res, "can't create node: %s", spa_strerror(res));
goto error_exit_free;
error_exit_free:
pw_resource_destroy(node_resource);
error_exit:

20
src/modules/module-client-node/client-node.c
View file

@ -1680,10 +1680,13 @@ struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
const struct spa_support *support;
uint32_t n_support;
const char *name;
int res;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return NULL;
if (impl == NULL) {
res = -errno;
goto error_exit_cleanup;
}
this = &impl->this;
@ -1714,6 +1717,7 @@ struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
(struct spa_node *)&impl->node.node,
NULL,
properties, 0);
if (this->node == NULL)
goto error_no_node;
@ -1739,9 +1743,19 @@ struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
return this;
error_no_node:
pw_resource_destroy(this->resource);
res = -errno;
node_clear(&impl->node);
properties = NULL;
goto error_exit_free;
error_exit_free:
free(impl);
error_exit_cleanup:
if (resource)
pw_resource_destroy(resource);
if (properties)
pw_properties_free(properties);
errno = -res;
return NULL;
}

32
src/modules/module-client-node/client-stream.c
View file

@ -1252,10 +1252,13 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
struct pw_properties *props;
uint32_t n_support;
const char *name;
int res;
impl = calloc(1, sizeof(struct impl));
if (impl == NULL)
return NULL;
if (impl == NULL) {
res = -errno;
goto error_exit_cleanup;
}
this = &impl->this;
@ -1271,8 +1274,11 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
parent,
props,
false);
if (impl->client_node == NULL)
goto error_no_node;
resource = NULL;
if (impl->client_node == NULL) {
res = -errno;
goto error_exit_free;
}
impl->cnode = pw_node_get_implementation(impl->client_node->node);
spa_node_set_callbacks(impl->cnode, &node_callbacks, impl);
@ -1293,8 +1299,11 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
(struct spa_node *)&impl->node.node,
NULL,
properties, 0);
if (this->node == NULL)
goto error_no_node;
properties = NULL;
if (this->node == NULL) {
res = -errno;
goto error_exit_free_client_node;
}
this->node->remote = true;
@ -1305,9 +1314,16 @@ struct pw_client_stream *pw_client_stream_new(struct pw_resource *resource,
return this;
error_no_node:
pw_resource_destroy(resource);
error_exit_free_client_node:
pw_client_node_destroy(impl->client_node);
error_exit_free:
free(impl);
error_exit_cleanup:
if (resource)
pw_resource_destroy(resource);
if (properties)
pw_properties_free(properties);
errno = -res;
return NULL;
}

98
src/modules/module-client-node/remote-node.c
View file

@ -656,9 +656,7 @@ client_node_port_set_param(void *object,
port = pw_node_find_port(data->node, direction, port_id);
if (port == NULL) {
res = -EINVAL;
pw_proxy_error(proxy, res, "unknown %s port %d",
direction == SPA_DIRECTION_INPUT ? "input" : "output", port_id);
goto done;
goto error_exit;
}
pw_log_debug("port %p: set param %d %p", port, id, param);
@ -672,12 +670,14 @@ client_node_port_set_param(void *object,
}
res = pw_port_set_param(port, id, flags, param);
if (res < 0) {
pw_proxy_error(proxy, res, "can't set port param: %s", spa_strerror(res));
goto done;
}
if (res < 0)
goto error_exit;
done:
return res;
error_exit:
pw_log_error("port %p: set_param %d %p: %s", port, id, param, spa_strerror(res));
pw_proxy_error(proxy, res, "port_set_param: %s", spa_strerror(res));
return res;
}
@ -696,9 +696,8 @@ client_node_port_use_buffers(void *object,
mix = ensure_mix(data, direction, port_id, mix_id);
if (mix == NULL) {
res = -EINVAL;
pw_proxy_error(proxy, res, "can add mix");
goto done;
res = -ENOENT;
goto error_exit;
}
prot = PROT_READ | (direction == SPA_DIRECTION_OUTPUT ? PROT_WRITE : 0);
@ -716,17 +715,14 @@ client_node_port_use_buffers(void *object,
m = find_mem(data, buffers[i].mem_id);
if (m == NULL) {
pw_log_error("unknown memory id %u", buffers[i].mem_id);
res = -EINVAL;
pw_proxy_error(proxy, res, "unknown memory %u", buffers[i].mem_id);
goto cleanup;
res = -ENODEV;
goto error_exit_cleanup;
}
bid = pw_array_add(&mix->buffers, sizeof(struct buffer));
if (bid == NULL) {
res = -errno;
pw_proxy_error(proxy, res, "error allocating buffers : %m");
goto cleanup;
goto error_exit_cleanup;
}
bid->id = i;
@ -735,8 +731,7 @@ client_node_port_use_buffers(void *object,
buffers[i].offset, buffers[i].size);
if (bmem.map.ptr == NULL) {
res = -errno;
pw_proxy_error(proxy, res, "use_buffers: can't mmap memory: %m");
goto cleanup;
goto error_exit_cleanup;
}
if (mlock(bmem.map.ptr, bmem.map.map.size) < 0)
pw_log_warn("Failed to mlock memory %u %u: %m",
@ -754,8 +749,7 @@ client_node_port_use_buffers(void *object,
b = bid->buf = malloc(size);
if (b == NULL) {
res = -errno;
pw_proxy_error(proxy, res, "can't alloc memory: %s", spa_strerror(res));
goto cleanup;
goto error_exit_cleanup;
}
memcpy(b, buffers[i].buffer, sizeof(struct spa_buffer));
@ -795,9 +789,8 @@ client_node_port_use_buffers(void *object,
if (bm == NULL) {
pw_log_error("unknown buffer mem %u", mem_id);
res = -EINVAL;
pw_proxy_error(proxy, res, "unknown buffer mem %u", mem_id);
goto cleanup;
res = -ENODEV;
goto error_exit_cleanup;
}
d->fd = bm->fd;
@ -824,15 +817,16 @@ client_node_port_use_buffers(void *object,
}
if ((res = pw_port_use_buffers(mix->port, mix->mix_id, bufs, n_buffers)) < 0)
pw_proxy_error(proxy, res, "can't use buffers: %s", spa_strerror(res));
goto error_exit_cleanup;
done:
return res;
cleanup:
error_exit_cleanup:
clear_buffers(data, mix);
goto done;
error_exit:
pw_log_error("port %p: use_buffers: %s", mix, spa_strerror(res));
pw_proxy_error(proxy, res, "port_use_buffers error: %s", spa_strerror(res));
return res;
}
static int
@ -854,9 +848,8 @@ client_node_port_set_io(void *object,
mix = ensure_mix(data, direction, port_id, mix_id);
if (mix == NULL) {
res = -EINVAL;
pw_proxy_error(proxy, res, "can't get mixer: %s", spa_strerror(res));
return res;
res = -ENOENT;
goto error_exit;
}
if (memid == SPA_ID_INVALID) {
@ -866,17 +859,14 @@ client_node_port_set_io(void *object,
else {
m = find_mem(data, memid);
if (m == NULL) {
pw_log_warn("unknown memory id %u", memid);
res = -EINVAL;
pw_proxy_error(proxy, res, "unknown memory id %u", memid);
return res;
res = -ENODEV;
goto error_exit;
}
ptr = mem_map(data, &m->map, m->fd,
PROT_READ|PROT_WRITE, offset, size);
if (ptr == NULL) {
res = -errno;
pw_proxy_error(proxy, res, "port_set_io: mmap failed: %m");
return res;
goto error_exit;
}
m->ref++;
@ -901,9 +891,14 @@ client_node_port_set_io(void *object,
id,
ptr,
size)) < 0)
pw_proxy_error(proxy, res, "set_io failed: %s", spa_strerror(res));
goto error_exit;
}
return res;
error_exit:
pw_log_error("port %p: set_io: %s", mix, spa_strerror(res));
pw_proxy_error(proxy, res, "port_set_io failed: %s", spa_strerror(res));
return res;
}
static int link_signal_func(void *user_data)
@ -946,16 +941,14 @@ client_node_set_activation(void *object,
else {
m = find_mem(data, memid);
if (m == NULL) {
pw_log_warn("unknown memory id %u", memid);
res = -EINVAL;
pw_proxy_error(proxy, res, "unknown memory id %u", memid);
return res;
res = -ENODEV;
goto error_exit;
}
ptr = mem_map(data, &m->map, m->fd,
PROT_READ|PROT_WRITE, offset, size);
if (ptr == NULL) {
pw_proxy_error(proxy, -errno, "set_activation: mmap failed: %m");
return -errno;
res = -errno;
goto error_exit;
}
m->ref++;
}
@ -970,8 +963,10 @@ client_node_set_activation(void *object,
if (ptr) {
link = pw_array_add(&data->links, sizeof(struct link));
if (link == NULL)
return -errno;
if (link == NULL) {
res = -errno;
goto error_exit;
}
link->node_id = node_id;
link->mem_id = memid;
link->target.activation = ptr;
@ -988,13 +983,16 @@ client_node_set_activation(void *object,
} else {
link = find_activation(&data->links, node_id);
if (link == NULL) {
res = -EINVAL;
goto exit;
res = -ENOENT;
goto error_exit;
}
clear_link(data, link);
}
return res;
exit:
error_exit:
pw_log_error("node %p: set activation %d: %s", node, node_id, spa_strerror(res));
pw_proxy_error(proxy, res, "set_activation: %s", spa_strerror(res));
return res;
}

34
src/modules/spa/module-device.c
View file

@ -57,6 +57,9 @@ struct device_data {
static void module_destroy(void *_data)
{
struct device_data *data = _data;
spa_hook_remove(&data->module_listener);
pw_device_destroy(data->this);
}
@ -69,23 +72,26 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_properties *props = NULL;
char **argv;
char **argv = NULL;
int n_tokens;
struct pw_core *core = pw_module_get_core(module);
struct pw_device *device;
struct device_data *data;
int res;
if (args == NULL)
goto wrong_arguments;
goto error_arguments;
argv = pw_split_strv(args, " \t", 3, &n_tokens);
if (n_tokens < 2)
goto not_enough_arguments;
goto error_arguments;
if (n_tokens == 3) {
props = pw_properties_new_string(argv[2]);
if (props == NULL)
return -ENOMEM;
if (props == NULL) {
res = -errno;
goto error_exit_cleanup;
}
}
device = pw_spa_device_load(core,
@ -95,12 +101,13 @@ int pipewire__module_init(struct pw_module *module, const char *args)
0,
props,
sizeof(struct device_data));
if (device == NULL) {
res = -errno;
goto error_exit_cleanup;
}
pw_free_strv(argv);
if (device == NULL)
return -ENOMEM;
data = pw_spa_device_get_user_data(device);
data->this = device;
data->core = core;
@ -112,9 +119,12 @@ int pipewire__module_init(struct pw_module *module, const char *args)
return 0;
not_enough_arguments:
pw_free_strv(argv);
wrong_arguments:
error_arguments:
res = -EINVAL;
pw_log_error("usage: module-spa-device " MODULE_USAGE);
return -EINVAL;
goto error_exit_cleanup;
error_exit_cleanup:
if (argv)
pw_free_strv(argv);
return res;
}

35
src/modules/spa/module-monitor.c
View file

@ -72,22 +72,24 @@ int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_core *core = pw_module_get_core(module);
struct pw_properties *props = NULL;
char **argv;
int n_tokens;
char **argv = NULL;
int n_tokens, res;
struct pw_spa_monitor *monitor;
struct data *data;
if (args == NULL)
goto wrong_arguments;
goto error_arguments;
argv = pw_split_strv(args, " \t", INT_MAX, &n_tokens);
if (n_tokens < 2)
goto not_enough_arguments;
goto error_arguments;
if (n_tokens == 3) {
props = pw_properties_new_string(argv[2]);
if (props == NULL)
return -ENOMEM;
if (props == NULL) {
res = -errno;
goto error_exit_cleanup;
}
}
monitor = pw_spa_monitor_load(core,
@ -95,23 +97,28 @@ int pipewire__module_init(struct pw_module *module, const char *args)
argv[0], argv[1],
props,
sizeof(struct data));
if (monitor == NULL)
return -ENOMEM;
if (monitor == NULL) {
res = -errno;
goto error_exit_cleanup;
}
pw_free_strv(argv);
data = monitor->user_data;
data->monitor = monitor;
pw_free_strv(argv);
pw_module_add_listener(module, &data->module_listener, &module_events, data);
pw_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
return 0;
not_enough_arguments:
pw_free_strv(argv);
wrong_arguments:
error_arguments:
res = -EINVAL;
pw_log_error("usage: module-spa-monitor " MODULE_USAGE);
return -EINVAL;
goto error_exit_cleanup;
error_exit_cleanup:
if (argv)
pw_free_strv(argv);
return res;
}

34
src/modules/spa/module-node-factory.c
View file

@ -83,13 +83,14 @@ static void *create_object(void *_data,
struct pw_node *node;
const char *factory_name, *name;
struct node_data *nd;
int res;
if (properties == NULL)
goto no_properties;
goto error_properties;
factory_name = pw_properties_get(properties, SPA_KEY_FACTORY_NAME);
if (factory_name == NULL)
goto no_properties;
goto error_properties;
name = pw_properties_get(properties, PW_KEY_NODE_NAME);
if (name == NULL)
@ -104,7 +105,7 @@ static void *create_object(void *_data,
properties,
sizeof(struct node_data));
if (node == NULL)
goto no_mem;
goto error_create_node;
nd = pw_spa_node_get_user_data(node);
nd->node = node;
@ -120,17 +121,24 @@ static void *create_object(void *_data,
return node;
no_properties:
error_properties:
res = -EINVAL;
pw_log_error("factory %p: usage: " FACTORY_USAGE, data->this);
if (resource) {
pw_resource_error(resource, -EINVAL, "usage: " FACTORY_USAGE);
}
return NULL;
no_mem:
pw_log_error("can't create node: no memory");
if (resource) {
pw_resource_error(resource, -ENOMEM, "no memory");
}
if (resource)
pw_resource_error(resource, res, "usage: " FACTORY_USAGE);
goto error_exit_cleanup;
error_create_node:
res = -errno;
pw_log_error("can't create node: %m");
if (resource)
pw_resource_error(resource, res, "can't create node: %s", spa_strerror(res));
goto error_exit;
error_exit_cleanup:
if (properties)
pw_properties_free(properties);
error_exit:
errno = -res;
return NULL;
}

34
src/modules/spa/module-node.c
View file

@ -60,6 +60,7 @@ struct node_data {
static void module_destroy(void *_data)
{
struct node_data *data = _data;
spa_hook_remove(&data->module_listener);
pw_node_destroy(data->this);
}
@ -72,23 +73,25 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_properties *props = NULL;
char **argv;
int n_tokens;
char **argv = NULL;
int n_tokens, res;
struct pw_core *core = pw_module_get_core(module);
struct pw_node *node;
struct node_data *data;
if (args == NULL)
goto wrong_arguments;
goto error_arguments;
argv = pw_split_strv(args, " \t", 3, &n_tokens);
if (n_tokens < 2)
goto not_enough_arguments;
goto error_arguments;
if (n_tokens == 3) {
props = pw_properties_new_string(argv[2]);
if (props == NULL)
return -ENOMEM;
if (props == NULL) {
res = -errno;
goto error_exit_cleanup;
}
}
node = pw_spa_node_load(core,
@ -99,10 +102,12 @@ int pipewire__module_init(struct pw_module *module, const char *args)
props,
sizeof(struct node_data));
pw_free_strv(argv);
if (node == NULL) {
res = -errno;
goto error_exit_cleanup;
}
if (node == NULL)
return -ENOMEM;
pw_free_strv(argv);
data = pw_spa_node_get_user_data(node);
data->this = node;
@ -116,9 +121,12 @@ int pipewire__module_init(struct pw_module *module, const char *args)
return 0;
not_enough_arguments:
pw_free_strv(argv);
wrong_arguments:
error_arguments:
res = -EINVAL;
pw_log_error("usage: module-spa-node " MODULE_USAGE);
return -EINVAL;
goto error_exit_cleanup;
error_exit_cleanup:
if (argv)
pw_free_strv(argv);
return res;
}

36
src/modules/spa/spa-device.c
View file

@ -142,30 +142,34 @@ struct pw_device *pw_spa_device_load(struct pw_core *core,
handle = pw_core_load_spa_handle(core, factory_name,
properties ? &properties->dict : NULL);
if (handle == NULL) {
res = -errno;
pw_log_error("can't load device handle: %m");
goto exit;
}
if (handle == NULL)
goto error_load;
if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) {
pw_log_error("can't get device interface %d", res);
goto exit_unload;
}
if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0)
goto error_interface;
this = pw_spa_device_new(core, owner, parent, name, flags,
iface, handle, properties, user_data_size);
if (this == NULL) {
res = -errno;
pw_log_error("can't create device: %m");
goto exit_unload;
}
if (this == NULL)
goto error_device;
return this;
exit_unload:
error_load:
res = -errno;
pw_log_error("can't load device handle: %m");
goto error_exit;
error_interface:
pw_log_error("can't get device interface %d", res);
goto error_exit_unload;
error_device:
res = -errno;
pw_log_error("can't create device: %m");
goto error_exit_unload;
error_exit_unload:
pw_unload_spa_handle(handle);
exit:
error_exit:
errno = -res;
return NULL;
}

25
src/modules/spa/spa-monitor.c
View file

@ -117,18 +117,18 @@ static struct monitor_object *add_object(struct pw_spa_monitor *this, uint32_t i
if (handle == NULL) {
res = -errno;
pw_log_error("can't make factory instance: %m");
goto error_free_props;
goto error_exit_free_props;
}
if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) {
pw_log_error("can't get %d interface: %s", info->type, spa_strerror(res));
goto error_free_handle;
goto error_exit_free_handle;
}
obj = calloc(1, sizeof(struct monitor_object));
if (obj == NULL) {
res = -errno;
goto error_free_handle;
goto error_exit_free_handle;
}
obj->id = id;
obj->name = strdup(name);
@ -149,19 +149,19 @@ static struct monitor_object *add_object(struct pw_spa_monitor *this, uint32_t i
default:
res = -ENOTSUP;
pw_log_error("interface %d not implemented", obj->type);
goto error_free_object;
goto error_exit_free_object;
}
spa_list_append(&impl->item_list, &obj->link);
return obj;
error_free_object:
error_exit_free_object:
free(obj->name);
free(obj);
error_free_handle:
error_exit_free_handle:
pw_unload_spa_handle(handle);
error_free_props:
error_exit_free_props:
pw_properties_free(props);
errno = -res;
return NULL;
@ -279,18 +279,18 @@ struct pw_spa_monitor *pw_spa_monitor_load(struct pw_core *core,
properties ? &properties->dict : NULL);
if (handle == NULL) {
res = -errno;
goto exit;
goto error_exit;
}
if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_Monitor, &iface)) < 0) {
pw_log_error("can't get MONITOR interface: %s", spa_strerror(res));
goto exit_unload;
goto error_exit_unload;
}
impl = calloc(1, sizeof(struct impl) + user_data_size);
if (impl == NULL) {
res = -errno;
goto exit_unload;
goto error_exit_unload;
}
impl->core = core;
@ -313,12 +313,11 @@ struct pw_spa_monitor *pw_spa_monitor_load(struct pw_core *core,
return this;
exit_unload:
error_exit_unload:
pw_unload_spa_handle(handle);
exit:
error_exit:
errno = -res;
return NULL;
}
void pw_spa_monitor_destroy(struct pw_spa_monitor *monitor)

29
src/modules/spa/spa-node.c
View file

@ -125,14 +125,17 @@ pw_spa_node_new(struct pw_core *core,
int res;
this = pw_node_new(core, name, properties, sizeof(struct impl) + user_data_size);
if (this == NULL)
return NULL;
if (this == NULL) {
res = -errno;
goto error_exit;
}
impl = this->user_data;
impl->this = this;
impl->owner = owner;
impl->parent = parent;
impl->node = node;
impl->handle = handle;
impl->flags = flags;
if (user_data_size > 0)
@ -140,7 +143,7 @@ pw_spa_node_new(struct pw_core *core,
pw_node_add_listener(this, &impl->node_listener, &node_events, impl);
if ((res = pw_node_set_implementation(this, impl->node)) < 0)
goto clean_node;
goto error_exit_clean_node;
if (flags & PW_SPA_NODE_FLAG_ASYNC) {
impl->init_pending = spa_node_sync(impl->node, res);
@ -149,8 +152,12 @@ pw_spa_node_new(struct pw_core *core,
}
return this;
clean_node:
error_exit_clean_node:
pw_node_destroy(this);
handle = NULL;
error_exit:
if (handle)
pw_unload_spa_handle(handle);
errno = -res;
return NULL;
@ -257,12 +264,12 @@ struct pw_node *pw_spa_node_load(struct pw_core *core,
properties ? &properties->dict : NULL);
if (handle == NULL) {
res = -errno;
goto exit;
goto error_exit_cleanup;
}
if ((res = spa_handle_get_interface(handle, SPA_TYPE_INTERFACE_Node, &iface)) < 0) {
pw_log_error("can't get node interface %d", res);
goto exit_unload;
goto error_exit_unload;
}
if (SPA_RESULT_IS_ASYNC(res))
flags |= PW_SPA_NODE_FLAG_ASYNC;
@ -279,18 +286,20 @@ struct pw_node *pw_spa_node_load(struct pw_core *core,
spa_node, handle, properties, user_data_size);
if (this == NULL) {
res = -errno;
goto exit;
goto error_exit;
}
impl = this->user_data;
impl->handle = handle;
impl->factory_name = strdup(factory_name);
return this;
exit_unload:
error_exit_unload:
pw_unload_spa_handle(handle);
exit:
error_exit_cleanup:
if (properties)
pw_properties_free(properties);
error_exit:
errno = -res;
return NULL;
}

8
src/pipewire/command.c
View file

@ -93,7 +93,7 @@ static struct pw_command *parse_command_help(const char *line, char **err)
return this;
no_mem:
asprintf(err, "no memory");
asprintf(err, "alloc failed: %m");
return NULL;
}
@ -133,7 +133,7 @@ static struct pw_command *parse_command_add_spa_lib(const char *line, char **err
pw_free_strv(this->args);
return NULL;
no_mem:
asprintf(err, "no memory");
asprintf(err, "alloc failed: %m");
return NULL;
}
@ -173,7 +173,7 @@ static struct pw_command *parse_command_module_load(const char *line, char **err
pw_free_strv(this->args);
return NULL;
no_mem:
asprintf(err, "no memory");
asprintf(err, "alloc failed: %m");
return NULL;
}
@ -217,7 +217,7 @@ static struct pw_command *parse_command_exec(const char *line, char **err)
pw_free_strv(this->args);
return NULL;
no_mem:
asprintf(err, "no memory");
asprintf(err, "alloc failed: %m");
return NULL;
}

7
src/pipewire/control.c
View file

@ -53,12 +53,12 @@ pw_control_new(struct pw_core *core,
break;
default:
errno = -ENOTSUP;
goto exit;
goto error_exit;
}
impl = calloc(1, sizeof(struct impl) + user_data_size);
if (impl == NULL)
goto exit;
goto error_exit;
this = &impl->this;
this->id = id;
@ -86,7 +86,7 @@ pw_control_new(struct pw_core *core,
return this;
exit:
error_exit:
return NULL;
}
@ -223,7 +223,6 @@ int pw_control_add_link(struct pw_control *control, uint32_t cmix,
pw_control_emit_linked(control, other);
pw_control_emit_linked(other, control);
exit:
return res;
}

34
src/pipewire/core.c
View file

@ -307,49 +307,51 @@ core_create_object(void *object,
factory = pw_core_find_factory(client->core, factory_name);
if (factory == NULL || factory->global == NULL)
goto no_factory;
goto error_no_factory;
if (!PW_PERM_IS_R(pw_global_get_permissions(factory->global, client)))
goto no_factory;
goto error_no_factory;
if (factory->info.type != type)
goto wrong_type;
goto error_type;
if (factory->info.version < version)
goto wrong_version;
goto error_version;
if (props) {
properties = pw_properties_new_dict(props);
if (properties == NULL)
goto no_properties;
goto error_properties;
} else
properties = NULL;
/* error will be posted */
obj = pw_factory_create_object(factory, resource, type, version, properties, new_id);
if (obj == NULL)
goto create_failed;
goto error_create_failed;
return 0;
no_factory:
res = -EINVAL;
error_no_factory:
res = -ENOENT;
pw_log_error("can't find node factory %s", factory_name);
pw_resource_error(resource, res, "unknown factory name %s", factory_name);
goto error;
wrong_version:
wrong_type:
goto error_exit;
error_version:
error_type:
res = -EPROTO;
pw_log_error("invalid resource type/version");
pw_resource_error(resource, res, "wrong resource type/version");
goto error;
no_properties:
goto error_exit;
error_properties:
res = -errno;
pw_log_error("can't create properties");
pw_log_error("can't create properties: %m");
pw_resource_error(resource, res, "can't create properties: %s", spa_strerror(res));
create_failed:
goto error_exit;
error_create_failed:
res = -errno;
error:
goto error_exit;
error_exit:
pw_map_insert_at(&client->objects, new_id, NULL);
pw_core_resource_remove_id(client->core_resource, new_id);
errno = -res;

4
src/pipewire/device.c
View file

@ -481,12 +481,12 @@ static void device_add(struct pw_device *device, uint32_t id,
}
if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) {
pw_log_error("can't get NODE interface: %d", res);
pw_log_error("can't get NODE interface: %s", spa_strerror(res));
return;
}
props = pw_properties_copy(device->properties);
if (info->props)
if (info->props && props)
pw_properties_update(props, info->props);
node = pw_node_new(core,

14
src/pipewire/global.c
View file

@ -298,23 +298,25 @@ pw_global_bind(struct pw_global *global, struct pw_client *client, uint32_t perm
int res;
if (global->version < version)
goto wrong_version;
goto error_version;
if ((res = global->func(global->object, client, permissions, version, id)) < 0)
goto error;
goto error_bind;
return res;
wrong_version:
error_version:
res = -EPROTO;
pw_core_resource_errorf(client->core_resource, id, client->recv_seq,
res, "id %d: interface version %d < %d",
id, global->version, version);
goto exit;
error:
goto error_exit;
error_bind:
pw_core_resource_errorf(client->core_resource, id, client->recv_seq,
res, "can't bind global %u/%u: %d (%s)", id, version, res, spa_strerror(res));
exit:
goto error_exit;
error_exit:
pw_log_error("can't bind global %u/%u: %d (%s)", id, version, res, spa_strerror(res));
pw_map_insert_at(&client->objects, id, NULL);
pw_core_resource_remove_id(client->core_resource, id);

2
src/pipewire/link.c
View file

@ -841,7 +841,7 @@ static void check_states(void *obj, void *user_data, int res, uint32_t id)
exit:
if (SPA_RESULT_IS_ERROR(res)) {
pw_log_debug("link %p: got error result %d", this, res);
pw_log_debug("link %p: got error result %d (%s)", this, res, spa_strerror(res));
return;
}

28
src/pipewire/node.c
View file

@ -779,12 +779,14 @@ struct pw_node *pw_node_new(struct pw_core *core,
struct pw_node *this;
size_t size;
struct spa_system *data_system = core->data_system;
char *n;
char *n = NULL;
int res;
impl = calloc(1, sizeof(struct impl) + user_data_size);
if (impl == NULL)
goto error;
if (impl == NULL) {
res = -errno;
goto error_exit;
}
if (name == NULL)
asprintf(&n, "node");
@ -802,7 +804,7 @@ struct pw_node *pw_node_new(struct pw_core *core,
properties = pw_properties_new(NULL, NULL);
if (properties == NULL) {
res = -errno;
goto clean_impl;
goto error_clean;
}
this->properties = properties;
@ -812,7 +814,7 @@ struct pw_node *pw_node_new(struct pw_core *core,
this->source.fd = spa_system_eventfd_create(data_system, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
if (this->source.fd == -1) {
res = -errno;
goto clean_impl;
goto error_clean;
}
this->source.func = node_on_fd_events;
@ -825,12 +827,12 @@ struct pw_node *pw_node_new(struct pw_core *core,
PW_MEMBLOCK_FLAG_SEAL,
size,
&this->activation)) < 0)
goto clean_impl;
goto error_clean;
impl->work = pw_work_queue_new(this->core->main_loop);
if (impl->work == NULL) {
res = -errno;
goto clean_impl;
goto error_clean;
}
this->info.name = n;
@ -872,14 +874,18 @@ struct pw_node *pw_node_new(struct pw_core *core,
return this;
clean_impl:
if (this->source.func != NULL)
error_clean:
if (this->activation)
pw_memblock_free(this->activation);
if (this->source.fd != -1)
spa_system_close(this->core->data_system, this->source.fd);
if (n)
free(n);
free(impl);
error_exit:
if (properties)
pw_properties_free(properties);
free(impl);
errno = -res;
error:
return NULL;
}

38
src/pipewire/pipewire.c
View file

@ -96,10 +96,12 @@ open_plugin(struct registry *registry,
char *filename;
void *hnd;
spa_handle_factory_enum_func_t enum_func;
int res = -EFAULT;
int res;
if (asprintf(&filename, "%s/%s.so", path, lib) < 0)
goto out;
if (asprintf(&filename, "%s/%s.so", path, lib) < 0) {
res = -ENOMEM;
goto error_out;
}
if ((plugin = find_plugin(registry, filename)) != NULL) {
free(filename);
@ -110,17 +112,17 @@ open_plugin(struct registry *registry,
if ((hnd = dlopen(filename, RTLD_NOW)) == NULL) {
res = -ENOENT;
fprintf(stderr, "can't load %s: %s\n", filename, dlerror());
goto out_free_filename;
goto error_free_filename;
}
if ((enum_func = dlsym(hnd, SPA_HANDLE_FACTORY_ENUM_FUNC_NAME)) == NULL) {
res = -ESRCH;
fprintf(stderr, "can't find enum function\n");
goto out_dlclose;
goto error_dlclose;
}
if ((plugin = calloc(1, sizeof(struct plugin))) == NULL) {
res = -errno;
goto out_dlclose;
goto error_dlclose;
}
plugin->ref = 1;
@ -133,11 +135,11 @@ open_plugin(struct registry *registry,
return plugin;
out_dlclose:
error_dlclose:
dlclose(hnd);
out_free_filename:
error_free_filename:
free(filename);
out:
error_out:
errno = -res;
return NULL;
}
@ -170,8 +172,8 @@ static const struct spa_handle_factory *find_factory(struct plugin *plugin, cons
}
res = -ENOENT;
out:
fprintf(stderr, "can't find factory %s: %s", factory_name, spa_strerror(res));
errno = -res;
fprintf(stderr, "can't find factory %s: %m\n", factory_name);
return NULL;
}
@ -226,7 +228,7 @@ struct spa_handle *pw_load_spa_handle(const char *lib,
if (factory_name == NULL) {
res = -EINVAL;
goto out;
goto error_out;
}
if (lib == NULL)
@ -237,20 +239,20 @@ struct spa_handle *pw_load_spa_handle(const char *lib,
if ((plugin = open_plugin(sup->registry, sup->plugin_dir, lib)) == NULL) {
res = -errno;
pw_log_warn("can't load '%s': %m", lib);
goto out;
goto error_out;
}
factory = find_factory(plugin, factory_name);
if (factory == NULL) {
res = -errno;
pw_log_warn("can't find factory '%s': %m %s", factory_name, spa_strerror(res));
goto out_unref_plugin;
goto error_unref_plugin;
}
handle = calloc(1, sizeof(struct handle) + spa_handle_factory_get_size(factory, info));
if (handle == NULL) {
res = -errno;
goto out;
goto error_unref_plugin;
}
if ((res = spa_handle_factory_init(factory,
@ -258,7 +260,7 @@ struct spa_handle *pw_load_spa_handle(const char *lib,
support, n_support)) < 0) {
pw_log_warn("can't make factory instance '%s': %d (%s)",
factory_name, res, spa_strerror(res));
goto out_free_handle;
goto error_free_handle;
}
handle->ref = 1;
@ -268,11 +270,11 @@ struct spa_handle *pw_load_spa_handle(const char *lib,
return &handle->handle;
out_free_handle:
error_free_handle:
free(handle);
out_unref_plugin:
error_unref_plugin:
unref_plugin(plugin);
out:
error_out:
errno = -res;
return NULL;
}

12
src/pipewire/stream.c
View file

@ -491,7 +491,7 @@ static int port_set_format(void *object,
p = add_param(stream, PARAM_TYPE_FORMAT, format);
if (p == NULL) {
res = -errno;
goto no_mem;
goto error_exit;
}
((struct spa_pod_object*)p->param)->body.id = SPA_PARAM_Format;
@ -517,7 +517,7 @@ static int port_set_format(void *object,
return 0;
no_mem:
error_exit:
pw_stream_finish_format(stream, res, NULL, 0);
return res;
}
@ -962,7 +962,7 @@ static int handle_connect(struct pw_stream *stream)
impl->node = pw_node_new(impl->core, stream->name,
pw_properties_copy(stream->properties), 0);
if (impl->node == NULL)
goto no_node;
goto error_node;
impl->node_methods = impl_node;
@ -986,7 +986,7 @@ static int handle_connect(struct pw_stream *stream)
stream->proxy = pw_remote_export(stream->remote,
PW_TYPE_INTERFACE_Node, NULL, impl->node, 0);
if (stream->proxy == NULL)
goto no_proxy;
goto error_proxy;
pw_proxy_add_listener(stream->proxy, &stream->proxy_listener, &proxy_events, stream);
pw_node_proxy_add_listener((struct pw_node_proxy*)stream->proxy,
@ -994,11 +994,11 @@ static int handle_connect(struct pw_stream *stream)
return 0;
no_node:
error_node:
res = -errno;
pw_log_error("stream %p: can't make node: %m", stream);
return res;
no_proxy:
error_proxy:
res = -errno;
pw_log_error("stream %p: can't make proxy: %m", stream);
return res;