X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/d6d9fb295d03a411974a148e469465e0f7c59891..0a583fe0c330d167f52784585afffdd8065a92cd:/src/daemon/main.c diff --git a/src/daemon/main.c b/src/daemon/main.c index 0db794bc..02a8ea64 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -67,14 +66,14 @@ #include #include #include -#include +#include #include -#include +#include #include #include +#include #include -#include #include #include #include @@ -82,19 +81,17 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include +#include #ifdef HAVE_DBUS #include #endif #include #include +#include #include "cmdline.h" #include "cpulimit.h" @@ -133,7 +130,7 @@ static void message_cb(pa_mainloop_api*a, pa_time_event*e, const struct timeval } pa_timeval_add(pa_gettimeofday(&tvnext), 100000); - a->rtclock_time_restart(e, &tvnext); + a->time_restart(e, &tvnext); } #endif @@ -202,15 +199,15 @@ static int change_user(void) { return -1; } - if (strcmp(pw->pw_dir, PA_SYSTEM_RUNTIME_PATH) != 0) + if (!pa_streq(pw->pw_dir, PA_SYSTEM_RUNTIME_PATH)) pa_log_warn(_("Home directory of user '%s' is not '%s', ignoring."), PA_SYSTEM_USER, PA_SYSTEM_RUNTIME_PATH); - if (pa_make_secure_dir(PA_SYSTEM_RUNTIME_PATH, 0755, pw->pw_uid, gr->gr_gid) < 0) { + if (pa_make_secure_dir(PA_SYSTEM_RUNTIME_PATH, 0755, pw->pw_uid, gr->gr_gid, true) < 0) { pa_log(_("Failed to create '%s': %s"), PA_SYSTEM_RUNTIME_PATH, pa_cstrerror(errno)); return -1; } - if (pa_make_secure_dir(PA_SYSTEM_STATE_PATH, 0700, pw->pw_uid, gr->gr_gid) < 0) { + if (pa_make_secure_dir(PA_SYSTEM_STATE_PATH, 0700, pw->pw_uid, gr->gr_gid, true) < 0) { pa_log(_("Failed to create '%s': %s"), PA_SYSTEM_STATE_PATH, pa_cstrerror(errno)); return -1; } @@ -254,6 +251,8 @@ static int change_user(void) { return -1; } + pa_drop_caps(); + pa_set_env("USER", PA_SYSTEM_USER); pa_set_env("USERNAME", PA_SYSTEM_USER); pa_set_env("LOGNAME", PA_SYSTEM_USER); @@ -269,7 +268,7 @@ static int change_user(void) { if (!getenv("PULSE_STATE_PATH")) pa_set_env("PULSE_STATE_PATH", PA_SYSTEM_STATE_PATH); - pa_log_info(_("Successfully dropped root privileges.")); + pa_log_info(_("Successfully changed user to \"" PA_SYSTEM_USER "\".")); return 0; } @@ -347,9 +346,9 @@ static char *check_configured_address(void) { char *default_server = NULL; pa_client_conf *c = pa_client_conf_new(); - pa_client_conf_load(c, NULL); + pa_client_conf_load(c); #ifdef HAVE_X11 - pa_client_conf_from_x11(c, NULL); + pa_client_conf_from_x11(c); #endif pa_client_conf_env(c); @@ -381,7 +380,7 @@ static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const if (dbus_error_is_set(&error)) pa_log_error("Failed to acquire %s: %s: %s", name, error.name, error.message); else - pa_log_error("D-Bus name %s already taken. Weird shit!", name); + pa_log_error("D-Bus name %s already taken.", name); /* PA cannot be started twice by the same user and hence we can * ignore mostly the case that a name is already taken. */ @@ -403,24 +402,25 @@ int main(int argc, char *argv[]) { char *s; char *configured_address; int r = 0, retval = 1, d = 0; - pa_bool_t valid_pid_file = FALSE; - pa_bool_t ltdl_init = FALSE; + bool valid_pid_file = false; + bool ltdl_init = false; int passed_fd = -1; const char *e; #ifdef HAVE_FORK int daemon_pipe[2] = { -1, -1 }; + int daemon_pipe2[2] = { -1, -1 }; #endif #ifdef OS_IS_WIN32 pa_time_event *win32_timer; struct timeval win32_tv; #endif int autospawn_fd = -1; - pa_bool_t autospawn_locked = FALSE; + bool autospawn_locked = false; #ifdef HAVE_DBUS pa_dbusobj_server_lookup *server_lookup = NULL; /* /org/pulseaudio/server_lookup */ pa_dbus_connection *lookup_service_bus = NULL; /* Always the user bus. */ pa_dbus_connection *server_bus = NULL; /* The bus where we reserve org.pulseaudio.Server, either the user or the system bus. */ - pa_bool_t start_server; + bool start_server; #endif pa_log_set_ident("pulseaudio"); @@ -499,8 +499,14 @@ int main(int argc, char *argv[]) { goto finish; } + if (conf->log_target) + pa_log_set_target(conf->log_target); + else { + pa_log_target target = { .type = PA_LOG_STDERR, .file = NULL }; + pa_log_set_target(&target); + } + pa_log_set_level(conf->log_level); - pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target); if (conf->log_meta) pa_log_set_flags(PA_LOG_PRINT_META, PA_LOG_SET); if (conf->log_time) @@ -516,10 +522,10 @@ int main(int argc, char *argv[]) { break; case PA_SERVER_TYPE_USER: case PA_SERVER_TYPE_NONE: - conf->system_instance = FALSE; + conf->system_instance = false; break; case PA_SERVER_TYPE_SYSTEM: - conf->system_instance = TRUE; + conf->system_instance = true; break; default: pa_assert_not_reached(); @@ -529,13 +535,13 @@ int main(int argc, char *argv[]) { if (!start_server && conf->local_server_type == PA_SERVER_TYPE_SYSTEM) { pa_log_notice(_("System mode refused for non-root user. Only starting the D-Bus server lookup service.")); - conf->system_instance = FALSE; + conf->system_instance = false; } #endif LTDL_SET_PRELOADED_SYMBOLS(); pa_ltdl_init(); - ltdl_init = TRUE; + ltdl_init = true; if (conf->dl_search_path) lt_dlsetsearchpath(conf->dl_search_path); @@ -654,6 +660,7 @@ int main(int argc, char *argv[]) { goto finish; } +#ifdef HAVE_GETUID if (getuid() == 0 && !conf->system_instance) pa_log_warn(_("This program is not intended to be run as root (unless --system is specified).")); #ifndef HAVE_DBUS /* A similar, only a notice worthy check was done earlier, if D-Bus is enabled. */ @@ -662,6 +669,7 @@ int main(int argc, char *argv[]) { goto finish; } #endif +#endif /* HAVE_GETUID */ if (conf->cmd == PA_CMD_START && conf->system_instance) { pa_log(_("--start not supported for system instances.")); @@ -669,10 +677,49 @@ int main(int argc, char *argv[]) { } if (conf->cmd == PA_CMD_START && (configured_address = check_configured_address())) { - pa_log_notice(_("User-configured server at %s, not autospawning."), configured_address); + /* There is an server address in our config, but where did it come from? + * By default a standard X11 login will load module-x11-publish which will + * inject PULSE_SERVER X11 property. If the PA daemon crashes, we will end + * up hitting this code path. So we have to check to see if our configured_address + * is the same as the value that would go into this property so that we can + * recover (i.e. autospawn) from a crash. + */ + char *ufn; + bool start_anyway = false; + + if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) { + char *id; + + if ((id = pa_machine_id())) { + pa_strlist *server_list; + char formatted_ufn[256]; + + pa_snprintf(formatted_ufn, sizeof(formatted_ufn), "{%s}unix:%s", id, ufn); + pa_xfree(id); + + if ((server_list = pa_strlist_parse(configured_address))) { + char *u = NULL; + + /* We only need to check the first server */ + server_list = pa_strlist_pop(server_list, &u); + pa_strlist_free(server_list); + + start_anyway = (u && pa_streq(formatted_ufn, u)); + pa_xfree(u); + } + } + pa_xfree(ufn); + } + + if (!start_anyway) { + pa_log_notice(_("User-configured server at %s, refusing to start/autospawn."), configured_address); + pa_xfree(configured_address); + retval = 0; + goto finish; + } + + pa_log_notice(_("User-configured server at %s, which appears to be local. Probing deeper."), configured_address); pa_xfree(configured_address); - retval = 0; - goto finish; } if (conf->system_instance && !conf->disallow_exit) @@ -683,7 +730,7 @@ int main(int argc, char *argv[]) { if (conf->system_instance && !conf->disable_shm) { pa_log_notice(_("Running in system mode, forcibly disabling SHM mode!")); - conf->disable_shm = TRUE; + conf->disable_shm = true; } if (conf->system_instance && conf->exit_idle_time >= 0) { @@ -701,16 +748,18 @@ int main(int argc, char *argv[]) { goto finish; } - if ((pa_autospawn_lock_acquire(TRUE) < 0)) { + if ((pa_autospawn_lock_acquire(true) < 0)) { pa_log("Failed to acquire autospawn lock"); goto finish; } - autospawn_locked = TRUE; + autospawn_locked = true; } if (conf->daemonize) { +#ifdef HAVE_FORK pid_t child; +#endif if (pa_stdio_acquire() < 0) { pa_log(_("Failed to acquire stdio.")); @@ -725,6 +774,7 @@ int main(int argc, char *argv[]) { if ((child = fork()) < 0) { pa_log(_("fork() failed: %s"), pa_cstrerror(errno)); + pa_close_pipe(daemon_pipe); goto finish; } @@ -756,9 +806,9 @@ int main(int argc, char *argv[]) { * to close it in the child */ pa_autospawn_lock_release(); - pa_autospawn_lock_done(TRUE); + pa_autospawn_lock_done(true); - autospawn_locked = FALSE; + autospawn_locked = false; autospawn_fd = -1; } @@ -766,8 +816,14 @@ int main(int argc, char *argv[]) { daemon_pipe[0] = -1; #endif - if (conf->auto_log_target) - pa_log_set_target(PA_LOG_SYSLOG); + if (!conf->log_target) { +#ifdef HAVE_JOURNAL + pa_log_target target = { .type = PA_LOG_JOURNAL, .file = NULL }; +#else + pa_log_target target = { .type = PA_LOG_SYSLOG, .file = NULL }; +#endif + pa_log_set_target(&target); + } #ifdef HAVE_SETSID if (setsid() < 0) { @@ -776,21 +832,54 @@ int main(int argc, char *argv[]) { } #endif +#ifdef HAVE_FORK /* We now are a session and process group leader. Let's fork * again and let the father die, so that we'll become a * process that can never acquire a TTY again, in a session and * process group without leader */ -#ifdef HAVE_FORK + if (pipe(daemon_pipe2) < 0) { + pa_log(_("pipe() failed: %s"), pa_cstrerror(errno)); + goto finish; + } + if ((child = fork()) < 0) { pa_log(_("fork() failed: %s"), pa_cstrerror(errno)); + pa_close_pipe(daemon_pipe2); goto finish; } if (child != 0) { - retval = 0; + ssize_t n; + /* Father */ + + pa_assert_se(pa_close(daemon_pipe2[1]) == 0); + daemon_pipe2[1] = -1; + + if ((n = pa_loop_read(daemon_pipe2[0], &retval, sizeof(retval), NULL)) != sizeof(retval)) { + + if (n < 0) + pa_log(_("read() failed: %s"), pa_cstrerror(errno)); + + retval = 1; + } + + /* We now have to take care of signalling the first fork with + * the return value we've received from this fork... */ + pa_assert(daemon_pipe[1] >= 0); + + pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); + pa_close(daemon_pipe[1]); + daemon_pipe[1] = -1; + goto finish; } + + pa_assert_se(pa_close(daemon_pipe2[0]) == 0); + daemon_pipe2[0] = -1; + + /* We no longer need the (first) daemon_pipe as it's handled in our child above */ + pa_close_pipe(daemon_pipe); #endif #ifdef SIGTTOU @@ -815,7 +904,8 @@ int main(int argc, char *argv[]) { #endif pa_rtclock_hrtimer_enable(); - pa_raise_priority(conf->nice_level); + if (conf->high_priority) + pa_raise_priority(conf->nice_level); if (conf->system_instance) if (change_user() < 0) @@ -907,7 +997,7 @@ int main(int argc, char *argv[]) { goto finish; } - valid_pid_file = TRUE; + valid_pid_file = true; } pa_disable_sigpipe(); @@ -918,7 +1008,7 @@ int main(int argc, char *argv[]) { pa_log_info(_("Dude, your kernel stinks! The chef's recommendation today is Linux with high-resolution timers enabled!")); if (conf->lock_memory) { -#ifdef HAVE_SYS_MMAN_H +#if defined(HAVE_SYS_MMAN_H) && !defined(__ANDROID__) if (mlockall(MCL_FUTURE) < 0) pa_log_warn("mlockall() failed: %s", pa_cstrerror(errno)); else @@ -938,11 +1028,12 @@ int main(int argc, char *argv[]) { } c->default_sample_spec = conf->default_sample_spec; + c->alternate_sample_rate = conf->alternate_sample_rate; c->default_channel_map = conf->default_channel_map; c->default_n_fragments = conf->default_n_fragments; c->default_fragment_size_msec = conf->default_fragment_size_msec; - c->sync_volume_safety_margin_usec = conf->sync_volume_safety_margin_usec; - c->sync_volume_extra_delay_usec = conf->sync_volume_extra_delay_usec; + c->deferred_volume_safety_margin_usec = conf->deferred_volume_safety_margin_usec; + c->deferred_volume_extra_delay_usec = conf->deferred_volume_extra_delay_usec; c->exit_idle_time = conf->exit_idle_time; c->scache_idle_time = conf->scache_idle_time; c->resample_method = conf->resample_method; @@ -950,7 +1041,7 @@ int main(int argc, char *argv[]) { c->realtime_scheduling = !!conf->realtime_scheduling; c->disable_remixing = !!conf->disable_remixing; c->disable_lfe_remixing = !!conf->disable_lfe_remixing; - c->sync_volume = !!conf->sync_volume; + c->deferred_volume = !!conf->deferred_volume; c->running_as_daemon = !!conf->daemonize; c->disallow_exit = conf->disallow_exit; c->flat_volumes = conf->flat_volumes; @@ -964,6 +1055,7 @@ int main(int argc, char *argv[]) { c->cpu_info.cpu_type = PA_CPU_X86; if (pa_cpu_init_arm(&(c->cpu_info.flags.arm))) c->cpu_info.cpu_type = PA_CPU_ARM; + pa_cpu_init_orc(c->cpu_info); } pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0); @@ -980,7 +1072,7 @@ int main(int argc, char *argv[]) { #endif #ifdef OS_IS_WIN32 - win32_timer = pa_mainloop_get_api(mainloop)->rtclock_time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL); + win32_timer = pa_mainloop_get_api(mainloop)->time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL); #endif if (!conf->no_cpu_limit) @@ -989,6 +1081,8 @@ int main(int argc, char *argv[]) { buf = pa_strbuf_new(); #ifdef HAVE_DBUS + pa_assert_se(dbus_threads_init_default()); + if (start_server) { #endif if (conf->load_default_script_file) { @@ -1021,7 +1115,7 @@ int main(int argc, char *argv[]) { * any modules to be loaded. We haven't loaded any so far, so one might * think there's no way to contact the server, but receiving certain * signals could still cause modules to load. */ - conf->disallow_module_loading = TRUE; + conf->disallow_module_loading = true; } #endif @@ -1031,22 +1125,22 @@ int main(int argc, char *argv[]) { #ifdef HAVE_DBUS if (!conf->system_instance) { - if (!(server_lookup = pa_dbusobj_server_lookup_new(c))) - goto finish; - if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) - goto finish; + if ((server_lookup = pa_dbusobj_server_lookup_new(c))) { + if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) + goto finish; + } } - if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"))) - goto finish; + if (start_server) + server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"); #endif #ifdef HAVE_FORK - if (daemon_pipe[1] >= 0) { + if (daemon_pipe2[1] >= 0) { int ok = 0; - pa_loop_write(daemon_pipe[1], &ok, sizeof(ok), NULL); - pa_close(daemon_pipe[1]); - daemon_pipe[1] = -1; + pa_loop_write(daemon_pipe2[1], &ok, sizeof(ok), NULL); + pa_close(daemon_pipe2[1]); + daemon_pipe2[1] = -1; } #endif @@ -1072,15 +1166,20 @@ finish: if (autospawn_locked) pa_autospawn_lock_release(); - pa_autospawn_lock_done(FALSE); + pa_autospawn_lock_done(false); } #ifdef OS_IS_WIN32 - if (win32_timer) + if (mainloop && win32_timer) pa_mainloop_get_api(mainloop)->time_free(win32_timer); #endif if (c) { + /* Ensure all the modules/samples are unloaded when the core is still ref'ed, + * as unlink callback hooks in modules may need the core to be ref'ed */ + pa_module_unload_all(c); + pa_scache_free_all(c); + pa_core_unref(c); pa_log_info(_("Daemon terminated.")); } @@ -1091,9 +1190,14 @@ finish: pa_signal_done(); #ifdef HAVE_FORK + /* If we have daemon_pipe[1] still open, this means we've failed after + * the first fork, but before the second. Therefore just write to it. */ if (daemon_pipe[1] >= 0) pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); + else if (daemon_pipe2[1] >= 0) + pa_loop_write(daemon_pipe2[1], &retval, sizeof(retval), NULL); + pa_close_pipe(daemon_pipe2); pa_close_pipe(daemon_pipe); #endif