mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-02-06 04:06:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: add async logging

Browse source
This commit is contained in:
Igor V. Kovalenko 2020-12-31 00:21:41 +03:00
parent 8db4dff2c5
commit 4d8d4e9458
8 changed files with 183 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/daemon/cmdline.c
View file

@ -53,6 +53,7 @@ enum {
ARG_LOG_TARGET,
ARG_LOG_META,
ARG_LOG_TIME,
ARG_LOG_ASYNC,
ARG_LOG_BACKTRACE,
ARG_LOAD,
ARG_FILE,
@ -89,6 +90,7 @@ static const struct option long_options[] = {
{"log-target", 1, 0, ARG_LOG_TARGET},
{"log-meta", 2, 0, ARG_LOG_META},
{"log-time", 2, 0, ARG_LOG_TIME},
{"log-async", 2, 0, ARG_LOG_ASYNC},
{"log-backtrace", 1, 0, ARG_LOG_BACKTRACE},
{"load", 1, 0, ARG_LOAD},
{"file", 1, 0, ARG_FILE},
@ -143,6 +145,7 @@ void pa_cmdline_help(const char *argv0) {
" -v --verbose Increase the verbosity level\n"
" --log-target={auto,syslog,stderr,file:PATH,newfile:PATH}\n"
" Specify the log target\n"
" --log-async[=BOOL] Asynchronously write to log file\n"
" --log-meta[=BOOL] Include code location in log messages\n"
" --log-time[=BOOL] Include timestamps in log messages\n"
" --log-backtrace=FRAMES Include a backtrace in log messages\n"
@ -341,6 +344,14 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
conf->log_time = !!b;
break;
case ARG_LOG_ASYNC:
if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--log-async expects boolean argument"));
goto fail;
}
conf->log_async = !!b;
break;
case ARG_LOG_META:
if ((b = optarg ? pa_parse_boolean(optarg) : 1) < 0) {
pa_log(_("--log-meta expects boolean argument"));

3
src/daemon/daemon-conf.c
View file

@ -81,6 +81,7 @@ static const pa_daemon_conf default_conf = {
.log_backtrace = 0,
.log_meta = false,
.log_time = false,
.log_async = false,
.resample_method = PA_RESAMPLER_AUTO,
.avoid_resampling = false,
.disable_remixing = false,
@ -619,6 +620,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
{ "shm-size-bytes", pa_config_parse_size, &c->shm_size, NULL },
{ "log-meta", pa_config_parse_bool, &c->log_meta, NULL },
{ "log-time", pa_config_parse_bool, &c->log_time, NULL },
{ "log-async", pa_config_parse_bool, &c->log_async, NULL },
{ "log-backtrace", pa_config_parse_unsigned, &c->log_backtrace, NULL },
#ifdef HAVE_SYS_RESOURCE_H
{ "rlimit-fsize", parse_rlimit, &c->rlimit_fsize, NULL },
@ -837,6 +839,7 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_strbuf_printf(s, "shm-size-bytes = %lu\n", (unsigned long) c->shm_size);
pa_strbuf_printf(s, "log-meta = %s\n", pa_yes_no(c->log_meta));
pa_strbuf_printf(s, "log-time = %s\n", pa_yes_no(c->log_time));
pa_strbuf_printf(s, "log-async = %s\n", pa_yes_no(c->log_async));
pa_strbuf_printf(s, "log-backtrace = %u\n", c->log_backtrace);
#ifdef HAVE_SYS_RESOURCE_H
pa_strbuf_printf(s, "rlimit-fsize = %li\n", c->rlimit_fsize.is_set ? (long int) c->rlimit_fsize.value : -1);

1
src/daemon/daemon-conf.h
View file

@ -76,6 +76,7 @@ typedef struct pa_daemon_conf {
disallow_exit,
log_meta,
log_time,
log_async,
flat_volumes,
rescue_streams,
lock_memory,

5
src/daemon/main.c
View file

@ -1094,6 +1094,9 @@ int main(int argc, char *argv[]) {
if (!conf->no_cpu_limit)
pa_assert_se(pa_cpu_limit_init(pa_mainloop_get_api(mainloop)) == 0);
if (conf->log_async)
pa_log_start_async();
buf = pa_strbuf_new();
#ifdef HAVE_DBUS
@ -1183,6 +1186,8 @@ int main(int argc, char *argv[]) {
#endif
finish:
pa_log_stop_async();
#ifdef HAVE_DBUS
if (server_bus)
pa_dbus_connection_unref(server_bus);