system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-07-22 18:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve some errors

Browse source 
Silence some -ENOENT warnings, they can happen when the object we
are introspecting is destroyed
This commit is contained in:
Wim Taymans 2020-11-29 16:21:14 +01:00
parent a1259a75be
commit b8300c663b
9 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pipewire-alsa/alsa-plugins/ctl_pipewire.c
View file

@ -1102,7 +1102,7 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
{
snd_ctl_pipewire_t *ctl = data;
pw_log_error(NAME" %p: error id:%u seq:%d res:%d (%s): %s", ctl,
pw_log_warn(NAME" %p: error id:%u seq:%d res:%d (%s): %s", ctl,
id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) {

2
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -838,7 +838,7 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
{
snd_pcm_pipewire_t *pw = data;
pw_log_error(NAME" %p: error id:%u seq:%d res:%d (%s): %s", pw,
pw_log_warn(NAME" %p: error id:%u seq:%d res:%d (%s): %s", pw,
id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) {

3
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -1471,7 +1471,8 @@ static void interface_added(struct spa_bt_monitor *monitor,
if (d == NULL) {
d = device_create(monitor, object_path);
if (d == NULL) {
spa_log_warn(monitor->log, "can't create device: %m");
spa_log_warn(monitor->log, "can't create Bluetooth device %s: %m",
object_path);
return;
}
}

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

@ -1988,7 +1988,8 @@ static void core_error(void *data, uint32_t id, int seq, int res, const char *me
{
struct impl *impl = data;
pw_log_error("error id:%u seq:%d res:%d (%s): %s",
pw_log(res == -ENOENT ? SPA_LOG_LEVEL_INFO : SPA_LOG_LEVEL_WARN,
"error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) {

2
src/gst/gstpipewirecore.c
View file

@ -41,7 +41,7 @@ on_core_error(void *data, uint32_t id, int seq, int res, const char *message)
{
GstPipeWireCore *core = data;
pw_log_error("error id:%u seq:%d res:%d (%s): %s",
pw_log_warn("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) {

2
src/gst/gstpipewiredeviceprovider.c
View file

@ -295,7 +295,7 @@ on_core_error(void *data, uint32_t id, int seq, int res, const char *message)
struct core_data *rd = data;
GstPipeWireDeviceProvider *self = rd->self;
pw_log_error("error id:%u seq:%d res:%d (%s): %s",
pw_log_warn("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) {

3
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -415,7 +415,8 @@ static int reply_error(struct client *client, uint32_t command, uint32_t tag, in
else
name = "invalid";
pw_log_warn(NAME" %p: [%s] ERROR command:%d (%s) tag:%u error:%u (%s)",
pw_log(res == -ENOENT ? SPA_LOG_LEVEL_INFO : SPA_LOG_LEVEL_WARN,
NAME" %p: [%s] ERROR command:%d (%s) tag:%u error:%u (%s)",
client, client->name, command, name, tag, error, spa_strerror(res));
reply = message_alloc(client, -1, 0);

5
src/modules/spa/module-device-factory.c
View file

@ -164,10 +164,11 @@ error_properties:
"usage: "FACTORY_USAGE);
goto error_exit;
error_device:
pw_log_debug("can't create device: %s", spa_strerror(res));
pw_log_debug("can't create device %s: %s", factory_name, spa_strerror(res));
if (resource)
pw_resource_errorf_id(resource, new_id, res,
"can't create device: %s", spa_strerror(res));
"can't create device %s: %s", factory_name,
spa_strerror(res));
goto error_exit;
error_bind:
pw_resource_errorf_id(resource, new_id, res, "can't bind device");

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

@ -30,6 +30,7 @@
#include <stdio.h>
#include <dlfcn.h>
#include <spa/utils/result.h>
#include <spa/param/props.h>
#include <spa/pod/iter.h>
#include <spa/debug/types.h>
@ -141,15 +142,16 @@ struct pw_impl_device *pw_spa_device_load(struct pw_context *context,
error_load:
res = -errno;
pw_log_debug("can't load device handle: %m");
pw_log_debug("can't load device handle %s: %m", factory_name);
goto error_exit;
error_interface:
pw_log_debug("can't get device interface %d", res);
pw_log_debug("can't get device interface %s: %s", factory_name,
spa_strerror(res));
goto error_exit_unload;
error_device:
properties = NULL;
res = -errno;
pw_log_debug("can't create device: %m");
pw_log_debug("can't create device %s: %m", factory_name);
goto error_exit_unload;
error_exit_unload: