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

conf: improve debug

Browse source
This commit is contained in:
Wim Taymans 2022-02-02 12:41:36 +01:00
parent 58ebe0f88a
commit 92e851f61b
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pipewire/conf.c
View file

@ -355,27 +355,28 @@ static int conf_load(const char *path, struct pw_properties *conf)
{ {
char *data; char *data;
struct stat sbuf; struct stat sbuf;
int fd; int fd, count;
if ((fd = open(path, O_CLOEXEC | O_RDONLY)) < 0) { if ((fd = open(path, O_CLOEXEC | O_RDONLY)) < 0)
pw_log_warn("%p: error loading config '%s': %m", conf, path); goto error;
return -errno;
}
pw_log_info("%p: loading config '%s'", conf, path);
if (fstat(fd, &sbuf) < 0) if (fstat(fd, &sbuf) < 0)
goto error_close; goto error_close;
if ((data = mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED) if ((data = mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
goto error_close; goto error_close;
close(fd); close(fd);
pw_properties_update_string(conf, data, sbuf.st_size); count = pw_properties_update_string(conf, data, sbuf.st_size);
munmap(data, sbuf.st_size); munmap(data, sbuf.st_size);
pw_log_info("%p: loaded config '%s' with %d items", conf, path, count);
return 0; return 0;
error_close: error_close:
close(fd); close(fd);
error:
pw_log_warn("%p: error loading config '%s': %m", conf, path);
return -errno; return -errno;
} }
@ -725,6 +726,7 @@ int pw_context_conf_section_for_each(struct pw_context *context, const char *sec
return 0; return 0;
path = pw_properties_get(conf, "config.path"); path = pw_properties_get(conf, "config.path");
pw_log_info("handle config '%s' section '%s'", path, section);
res = callback(data, path, section, str, strlen(str)); res = callback(data, path, section, str, strlen(str));
return res; return res;
} }