mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-12-20 08:56:47 -05:00
merge glitch-free branch back into trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering
parent
91f092eadc
commit
045c1d602d
189 changed files with 12559 additions and 4959 deletions
|
|
@ -115,7 +115,7 @@ static void message_cb(pa_mainloop_api*a, pa_time_event*e, PA_GCC_UNUSED const s
|
|||
MSG msg;
|
||||
struct timeval tvnext;
|
||||
|
||||
while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
|
||||
while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
|
||||
if (msg.message == WM_QUIT)
|
||||
raise(SIGTERM);
|
||||
else {
|
||||
|
|
@ -164,8 +164,6 @@ static void signal_callback(pa_mainloop_api*m, PA_GCC_UNUSED pa_signal_event *e,
|
|||
}
|
||||
}
|
||||
|
||||
#define set_env(key, value) putenv(pa_sprintf_malloc("%s=%s", (key), (value)))
|
||||
|
||||
#if defined(HAVE_PWD_H) && defined(HAVE_GRP_H)
|
||||
|
||||
static int change_user(void) {
|
||||
|
|
@ -241,14 +239,14 @@ static int change_user(void) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
set_env("USER", PA_SYSTEM_USER);
|
||||
set_env("USERNAME", PA_SYSTEM_USER);
|
||||
set_env("LOGNAME", PA_SYSTEM_USER);
|
||||
set_env("HOME", PA_SYSTEM_RUNTIME_PATH);
|
||||
pa_set_env("USER", PA_SYSTEM_USER);
|
||||
pa_set_env("USERNAME", PA_SYSTEM_USER);
|
||||
pa_set_env("LOGNAME", PA_SYSTEM_USER);
|
||||
pa_set_env("HOME", PA_SYSTEM_RUNTIME_PATH);
|
||||
|
||||
/* Relevant for pa_runtime_path() */
|
||||
set_env("PULSE_RUNTIME_PATH", PA_SYSTEM_RUNTIME_PATH);
|
||||
set_env("PULSE_CONFIG_PATH", PA_SYSTEM_RUNTIME_PATH);
|
||||
pa_set_env("PULSE_RUNTIME_PATH", PA_SYSTEM_RUNTIME_PATH);
|
||||
pa_set_env("PULSE_CONFIG_PATH", PA_SYSTEM_RUNTIME_PATH);
|
||||
|
||||
pa_log_info("Successfully dropped root privileges.");
|
||||
|
||||
|
|
@ -264,23 +262,6 @@ static int change_user(void) {
|
|||
|
||||
#endif /* HAVE_PWD_H && HAVE_GRP_H */
|
||||
|
||||
static int create_runtime_dir(void) {
|
||||
char fn[PATH_MAX];
|
||||
|
||||
pa_runtime_path(NULL, fn, sizeof(fn));
|
||||
|
||||
/* This function is called only when the daemon is started in
|
||||
* per-user mode. We create the runtime directory somewhere in
|
||||
* /tmp/ with the current UID/GID */
|
||||
|
||||
if (pa_make_secure_dir(fn, 0700, (uid_t)-1, (gid_t)-1) < 0) {
|
||||
pa_log("Failed to create '%s': %s", fn, pa_cstrerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
|
||||
static int set_one_rlimit(const pa_rlimit *r, int resource, const char *name) {
|
||||
|
|
@ -293,7 +274,7 @@ static int set_one_rlimit(const pa_rlimit *r, int resource, const char *name) {
|
|||
rl.rlim_cur = rl.rlim_max = r->value;
|
||||
|
||||
if (setrlimit(resource, &rl) < 0) {
|
||||
pa_log_warn("setrlimit(%s, (%u, %u)) failed: %s", name, (unsigned) r->value, (unsigned) r->value, pa_cstrerror(errno));
|
||||
pa_log_info("setrlimit(%s, (%u, %u)) failed: %s", name, (unsigned) r->value, (unsigned) r->value, pa_cstrerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -301,17 +282,27 @@ static int set_one_rlimit(const pa_rlimit *r, int resource, const char *name) {
|
|||
}
|
||||
|
||||
static void set_all_rlimits(const pa_daemon_conf *conf) {
|
||||
set_one_rlimit(&conf->rlimit_as, RLIMIT_AS, "RLIMIT_AS");
|
||||
set_one_rlimit(&conf->rlimit_core, RLIMIT_CORE, "RLIMIT_CORE");
|
||||
set_one_rlimit(&conf->rlimit_data, RLIMIT_DATA, "RLIMIT_DATA");
|
||||
set_one_rlimit(&conf->rlimit_fsize, RLIMIT_FSIZE, "RLIMIT_FSIZE");
|
||||
set_one_rlimit(&conf->rlimit_nofile, RLIMIT_NOFILE, "RLIMIT_NOFILE");
|
||||
set_one_rlimit(&conf->rlimit_data, RLIMIT_DATA, "RLIMIT_DATA");
|
||||
set_one_rlimit(&conf->rlimit_stack, RLIMIT_STACK, "RLIMIT_STACK");
|
||||
set_one_rlimit(&conf->rlimit_core, RLIMIT_CORE, "RLIMIT_CORE");
|
||||
set_one_rlimit(&conf->rlimit_rss, RLIMIT_RSS, "RLIMIT_RSS");
|
||||
#ifdef RLIMIT_NPROC
|
||||
set_one_rlimit(&conf->rlimit_nproc, RLIMIT_NPROC, "RLIMIT_NPROC");
|
||||
#endif
|
||||
set_one_rlimit(&conf->rlimit_nofile, RLIMIT_NOFILE, "RLIMIT_NOFILE");
|
||||
#ifdef RLIMIT_MEMLOCK
|
||||
set_one_rlimit(&conf->rlimit_memlock, RLIMIT_MEMLOCK, "RLIMIT_MEMLOCK");
|
||||
#endif
|
||||
set_one_rlimit(&conf->rlimit_as, RLIMIT_AS, "RLIMIT_AS");
|
||||
#ifdef RLIMIT_LOCKS
|
||||
set_one_rlimit(&conf->rlimit_locks, RLIMIT_LOCKS, "RLIMIT_LOCKS");
|
||||
#endif
|
||||
#ifdef RLIMIT_SIGPENDING
|
||||
set_one_rlimit(&conf->rlimit_sigpending, RLIMIT_SIGPENDING, "RLIMIT_SIGPENDING");
|
||||
#endif
|
||||
#ifdef RLIMIT_MSGQUEUE
|
||||
set_one_rlimit(&conf->rlimit_msgqueue, RLIMIT_MSGQUEUE, "RLIMIT_MSGQUEUE");
|
||||
#endif
|
||||
#ifdef RLIMIT_NICE
|
||||
set_one_rlimit(&conf->rlimit_nice, RLIMIT_NICE, "RLIMIT_NICE");
|
||||
|
|
@ -319,6 +310,9 @@ static void set_all_rlimits(const pa_daemon_conf *conf) {
|
|||
#ifdef RLIMIT_RTPRIO
|
||||
set_one_rlimit(&conf->rlimit_rtprio, RLIMIT_RTPRIO, "RLIMIT_RTPRIO");
|
||||
#endif
|
||||
#ifdef RLIMIT_RTTIME
|
||||
set_one_rlimit(&conf->rlimit_rttime, RLIMIT_RTTIME, "RLIMIT_RTTIME");
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -329,18 +323,19 @@ int main(int argc, char *argv[]) {
|
|||
pa_mainloop *mainloop = NULL;
|
||||
char *s;
|
||||
int r = 0, retval = 1, d = 0;
|
||||
int daemon_pipe[2] = { -1, -1 };
|
||||
pa_bool_t suid_root, real_root;
|
||||
int valid_pid_file = 0;
|
||||
pa_bool_t valid_pid_file = FALSE;
|
||||
gid_t gid = (gid_t) -1;
|
||||
pa_bool_t allow_realtime, allow_high_priority;
|
||||
pa_bool_t ltdl_init = FALSE;
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
pa_time_event *timer;
|
||||
struct timeval tv;
|
||||
int passed_fd = -1;
|
||||
const char *e;
|
||||
#ifdef HAVE_FORK
|
||||
int daemon_pipe[2] = { -1, -1 };
|
||||
#endif
|
||||
#ifdef OS_IS_WIN32
|
||||
pa_time_event *win32_timer;
|
||||
struct timeval win32_tv;
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(__linux__) && defined(__OPTIMIZE__)
|
||||
/*
|
||||
|
|
@ -355,7 +350,7 @@ int main(int argc, char *argv[]) {
|
|||
/* We have to execute ourselves, because the libc caches the
|
||||
* value of $LD_BIND_NOW on initialization. */
|
||||
|
||||
putenv(pa_xstrdup("LD_BIND_NOW=1"));
|
||||
pa_set_env("LD_BIND_NOW", "1");
|
||||
pa_assert_se(rp = pa_readlink("/proc/self/exe"));
|
||||
pa_assert_se(execv(rp, argv) == 0);
|
||||
}
|
||||
|
|
@ -385,6 +380,18 @@ int main(int argc, char *argv[]) {
|
|||
* is just too risky tun let PA run as root all the time. */
|
||||
}
|
||||
|
||||
if ((e = getenv("PULSE_PASSED_FD"))) {
|
||||
passed_fd = atoi(e);
|
||||
|
||||
if (passed_fd <= 2)
|
||||
passed_fd = -1;
|
||||
}
|
||||
|
||||
pa_close_all(passed_fd, -1);
|
||||
|
||||
pa_reset_sigs(-1);
|
||||
pa_unblock_sigs(-1);
|
||||
|
||||
/* At this point, we are a normal user, possibly with CAP_NICE if
|
||||
* we were started SUID. If we are started as normal root, than we
|
||||
* still are normal root. */
|
||||
|
|
@ -410,67 +417,66 @@ int main(int argc, char *argv[]) {
|
|||
pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target, NULL);
|
||||
|
||||
if (suid_root) {
|
||||
pa_bool_t allow_realtime, allow_high_priority;
|
||||
|
||||
/* Ok, we're suid root, so let's better not enable high prio
|
||||
* or RT by default */
|
||||
|
||||
allow_high_priority = allow_realtime = FALSE;
|
||||
|
||||
if (conf->high_priority || conf->realtime_scheduling)
|
||||
if (pa_own_uid_in_group(PA_REALTIME_GROUP, &gid) > 0) {
|
||||
pa_log_info("We're in the group '"PA_REALTIME_GROUP"', allowing real-time and high-priority scheduling.");
|
||||
allow_realtime = conf->realtime_scheduling;
|
||||
allow_high_priority = conf->high_priority;
|
||||
}
|
||||
|
||||
#ifdef HAVE_POLKIT
|
||||
if (conf->high_priority) {
|
||||
if (conf->high_priority && !allow_high_priority) {
|
||||
if (pa_polkit_check("org.pulseaudio.acquire-high-priority") > 0) {
|
||||
pa_log_info("PolicyKit grants us acquire-high-priority privilige.");
|
||||
pa_log_info("PolicyKit grants us acquire-high-priority privilege.");
|
||||
allow_high_priority = TRUE;
|
||||
} else
|
||||
pa_log_info("PolicyKit refuses acquire-high-priority privilige.");
|
||||
pa_log_info("PolicyKit refuses acquire-high-priority privilege.");
|
||||
}
|
||||
|
||||
if (conf->realtime_scheduling) {
|
||||
if (conf->realtime_scheduling && !allow_realtime) {
|
||||
if (pa_polkit_check("org.pulseaudio.acquire-real-time") > 0) {
|
||||
pa_log_info("PolicyKit grants us acquire-real-time privilige.");
|
||||
pa_log_info("PolicyKit grants us acquire-real-time privilege.");
|
||||
allow_realtime = TRUE;
|
||||
} else
|
||||
pa_log_info("PolicyKit refuses acquire-real-time privilige.");
|
||||
pa_log_info("PolicyKit refuses acquire-real-time privilege.");
|
||||
}
|
||||
#endif
|
||||
|
||||
if ((conf->high_priority || conf->realtime_scheduling) && pa_own_uid_in_group(PA_REALTIME_GROUP, &gid) > 0) {
|
||||
pa_log_info("We're in the group '"PA_REALTIME_GROUP"', allowing real-time and high-priority scheduling.");
|
||||
allow_realtime = conf->realtime_scheduling;
|
||||
allow_high_priority = conf->high_priority;
|
||||
}
|
||||
|
||||
if (!allow_high_priority && !allow_realtime) {
|
||||
|
||||
/* OK, there's no further need to keep CAP_NICE. Hence
|
||||
* let's give it up early */
|
||||
|
||||
pa_drop_caps();
|
||||
pa_drop_root();
|
||||
suid_root = real_root = FALSE;
|
||||
suid_root = FALSE;
|
||||
|
||||
if (conf->high_priority || conf->realtime_scheduling)
|
||||
pa_log_notice("Called SUID root and real-time/high-priority scheduling was requested in the configuration. However, we lack the necessary priviliges:\n"
|
||||
"We are not in group '"PA_REALTIME_GROUP"' and PolicyKit refuse to grant us priviliges. Dropping SUID again.\n"
|
||||
"For enabling real-time scheduling please acquire the appropriate PolicyKit priviliges, or become a member of '"PA_REALTIME_GROUP"', or increase the RLIMIT_NICE/RLIMIT_RTPRIO resource limits for this user.");
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
/* OK, we're a normal user, so let's allow the user evrything
|
||||
* he asks for, it's now the kernel's job to enforce limits,
|
||||
* not ours anymore */
|
||||
allow_high_priority = allow_realtime = TRUE;
|
||||
}
|
||||
|
||||
if (conf->high_priority && !allow_high_priority) {
|
||||
pa_log_info("High-priority scheduling enabled in configuration but now allowed by policy. Disabling forcibly.");
|
||||
conf->high_priority = FALSE;
|
||||
}
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
/* Reset resource limits. If we are run as root (for system mode)
|
||||
* this might end up increasing the limits, which is intended
|
||||
* behaviour. For all other cases, i.e. started as normal user, or
|
||||
* SUID root at this point we should have no CAP_SYS_RESOURCE and
|
||||
* increasing the limits thus should fail. Which is, too, intended
|
||||
* behaviour */
|
||||
|
||||
if (conf->realtime_scheduling && !allow_realtime) {
|
||||
pa_log_info("Real-time scheduling enabled in configuration but now allowed by policy. Disabling forcibly.");
|
||||
conf->realtime_scheduling = FALSE;
|
||||
}
|
||||
set_all_rlimits(conf);
|
||||
#endif
|
||||
|
||||
if (conf->high_priority && !pa_can_high_priority())
|
||||
pa_log_warn("High-priority scheduling enabled in configuration but not allowed by policy.");
|
||||
|
||||
if (conf->high_priority && conf->cmd == PA_CMD_DAEMON)
|
||||
pa_raise_priority(conf->nice_level);
|
||||
|
|
@ -482,28 +488,38 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
#ifdef RLIMIT_RTPRIO
|
||||
if (!drop) {
|
||||
|
||||
struct rlimit rl;
|
||||
/* At this point we still have CAP_NICE if we were loaded
|
||||
* SUID root. If possible let's acquire RLIMIT_RTPRIO
|
||||
* instead and give CAP_NICE up. */
|
||||
|
||||
const pa_rlimit rl = { 9, TRUE };
|
||||
if (getrlimit(RLIMIT_RTPRIO, &rl) >= 0) {
|
||||
|
||||
if (set_one_rlimit(&rl, RLIMIT_RTPRIO, "RLIMIT_RTPRIO") >= 0) {
|
||||
pa_log_info("Successfully increased RLIMIT_RTPRIO, giving up CAP_NICE.");
|
||||
drop = TRUE;
|
||||
} else
|
||||
pa_log_warn("RLIMIT_RTPRIO failed: %s", pa_cstrerror(errno));
|
||||
if (rl.rlim_cur >= 9)
|
||||
drop = TRUE;
|
||||
else {
|
||||
rl.rlim_max = rl.rlim_cur = 9;
|
||||
|
||||
if (setrlimit(RLIMIT_RTPRIO, &rl) >= 0) {
|
||||
pa_log_info("Successfully increased RLIMIT_RTPRIO");
|
||||
drop = TRUE;
|
||||
} else
|
||||
pa_log_warn("RLIMIT_RTPRIO failed: %s", pa_cstrerror(errno));
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (drop) {
|
||||
pa_log_info("Giving up CAP_NICE");
|
||||
pa_drop_caps();
|
||||
pa_drop_root();
|
||||
suid_root = real_root = FALSE;
|
||||
suid_root = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
if (conf->realtime_scheduling && !pa_can_realtime())
|
||||
pa_log_warn("Real-time scheduling enabled in configuration but not allowed by policy.");
|
||||
|
||||
LTDL_SET_PRELOADED_SYMBOLS();
|
||||
pa_ltdl_init();
|
||||
ltdl_init = TRUE;
|
||||
|
|
@ -605,7 +621,7 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
#ifdef HAVE_FORK
|
||||
if (pipe(daemon_pipe) < 0) {
|
||||
pa_log("Failed to create pipe.");
|
||||
pa_log("pipe failed: %s", pa_cstrerror(errno));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
|
|
@ -615,20 +631,24 @@ int main(int argc, char *argv[]) {
|
|||
}
|
||||
|
||||
if (child != 0) {
|
||||
ssize_t n;
|
||||
/* Father */
|
||||
|
||||
pa_assert_se(pa_close(daemon_pipe[1]) == 0);
|
||||
daemon_pipe[1] = -1;
|
||||
|
||||
if (pa_loop_read(daemon_pipe[0], &retval, sizeof(retval), NULL) != sizeof(retval)) {
|
||||
pa_log("read() failed: %s", pa_cstrerror(errno));
|
||||
if ((n = pa_loop_read(daemon_pipe[0], &retval, sizeof(retval), NULL)) != sizeof(retval)) {
|
||||
|
||||
if (n < 0)
|
||||
pa_log("read() failed: %s", pa_cstrerror(errno));
|
||||
|
||||
retval = 1;
|
||||
}
|
||||
|
||||
if (retval)
|
||||
pa_log("daemon startup failed.");
|
||||
pa_log("Daemon startup failed.");
|
||||
else
|
||||
pa_log_info("daemon startup successful.");
|
||||
pa_log_info("Daemon startup successful.");
|
||||
|
||||
goto finish;
|
||||
}
|
||||
|
|
@ -652,9 +672,9 @@ int main(int argc, char *argv[]) {
|
|||
pa_close(1);
|
||||
pa_close(2);
|
||||
|
||||
open("/dev/null", O_RDONLY);
|
||||
open("/dev/null", O_WRONLY);
|
||||
open("/dev/null", O_WRONLY);
|
||||
pa_assert_se(open("/dev/null", O_RDONLY) == 0);
|
||||
pa_assert_se(open("/dev/null", O_WRONLY) == 1);
|
||||
pa_assert_se(open("/dev/null", O_WRONLY) == 2);
|
||||
#else
|
||||
FreeConsole();
|
||||
#endif
|
||||
|
|
@ -677,39 +697,32 @@ int main(int argc, char *argv[]) {
|
|||
#endif
|
||||
}
|
||||
|
||||
pa_set_env("PULSE_INTERNAL", "1");
|
||||
pa_assert_se(chdir("/") == 0);
|
||||
umask(0022);
|
||||
|
||||
if (conf->system_instance) {
|
||||
if (conf->system_instance)
|
||||
if (change_user() < 0)
|
||||
goto finish;
|
||||
} else if (create_runtime_dir() < 0)
|
||||
goto finish;
|
||||
|
||||
pa_log_info("This is PulseAudio " PACKAGE_VERSION);
|
||||
pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
|
||||
pa_log_info("Using runtime directory %s.", s = pa_get_runtime_dir());
|
||||
pa_xfree(s);
|
||||
|
||||
if (conf->use_pid_file) {
|
||||
if (pa_pid_file_create() < 0) {
|
||||
pa_log("pa_pid_file_create() failed.");
|
||||
#ifdef HAVE_FORK
|
||||
if (conf->daemonize)
|
||||
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
|
||||
#endif
|
||||
goto finish;
|
||||
}
|
||||
|
||||
valid_pid_file = 1;
|
||||
valid_pid_file = TRUE;
|
||||
}
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
set_all_rlimits(conf);
|
||||
#endif
|
||||
|
||||
#ifdef SIGPIPE
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
#endif
|
||||
|
||||
pa_log_info("This is PulseAudio " PACKAGE_VERSION);
|
||||
pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
|
||||
|
||||
if (pa_rtclock_hrtimer())
|
||||
pa_log_info("Fresh high-resolution timers available! Bon appetit!");
|
||||
else
|
||||
|
|
@ -738,11 +751,11 @@ int main(int argc, char *argv[]) {
|
|||
c->realtime_priority = conf->realtime_priority;
|
||||
c->realtime_scheduling = !!conf->realtime_scheduling;
|
||||
c->disable_remixing = !!conf->disable_remixing;
|
||||
c->running_as_daemon = !!conf->daemonize;
|
||||
|
||||
pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);
|
||||
pa_signal_new(SIGINT, signal_callback, c);
|
||||
pa_signal_new(SIGTERM, signal_callback, c);
|
||||
|
||||
#ifdef SIGUSR1
|
||||
pa_signal_new(SIGUSR1, signal_callback, c);
|
||||
#endif
|
||||
|
|
@ -754,23 +767,27 @@ int main(int argc, char *argv[]) {
|
|||
#endif
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
pa_assert_se(timer = pa_mainloop_get_api(mainloop)->time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&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->daemonize)
|
||||
c->running_as_daemon = TRUE;
|
||||
|
||||
oil_init();
|
||||
|
||||
if (!conf->no_cpu_limit)
|
||||
pa_assert_se(pa_cpu_limit_init(pa_mainloop_get_api(mainloop)) == 0);
|
||||
|
||||
buf = pa_strbuf_new();
|
||||
if (conf->default_script_file)
|
||||
r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail);
|
||||
if (conf->load_default_script_file) {
|
||||
FILE *f;
|
||||
|
||||
if ((f = pa_daemon_conf_open_default_script_file(conf))) {
|
||||
r = pa_cli_command_execute_file_stream(c, f, buf, &conf->fail);
|
||||
fclose(f);
|
||||
}
|
||||
}
|
||||
|
||||
if (r >= 0)
|
||||
r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail);
|
||||
|
||||
pa_log_error("%s", s = pa_strbuf_tostring_free(buf));
|
||||
pa_xfree(s);
|
||||
|
||||
|
|
@ -780,53 +797,55 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
if (r < 0 && conf->fail) {
|
||||
pa_log("Failed to initialize daemon.");
|
||||
#ifdef HAVE_FORK
|
||||
if (conf->daemonize)
|
||||
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
|
||||
#endif
|
||||
} else if (!c->modules || pa_idxset_size(c->modules) == 0) {
|
||||
pa_log("daemon startup without any loaded modules, refusing to work.");
|
||||
#ifdef HAVE_FORK
|
||||
if (conf->daemonize)
|
||||
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
|
||||
#endif
|
||||
} else {
|
||||
|
||||
retval = 0;
|
||||
|
||||
if (c->default_sink_name &&
|
||||
pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) {
|
||||
pa_log_error("%s : Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name);
|
||||
retval = !!conf->fail;
|
||||
}
|
||||
|
||||
#ifdef HAVE_FORK
|
||||
if (conf->daemonize)
|
||||
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
|
||||
#endif
|
||||
|
||||
if (!retval) {
|
||||
pa_log_info("Daemon startup complete.");
|
||||
if (pa_mainloop_run(mainloop, &retval) < 0)
|
||||
retval = 1;
|
||||
pa_log_info("Daemon shutdown initiated.");
|
||||
}
|
||||
goto finish;
|
||||
}
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
pa_mainloop_get_api(mainloop)->time_free(timer);
|
||||
if (!c->modules || pa_idxset_size(c->modules) == 0) {
|
||||
pa_log("Daemon startup without any loaded modules, refusing to work.");
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (c->default_sink_name && !pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, TRUE) && conf->fail) {
|
||||
pa_log_error("Default sink name (%s) does not exist in name register.", c->default_sink_name);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
|
||||
#ifdef HAVE_FORK
|
||||
if (conf->daemonize) {
|
||||
int ok = 0;
|
||||
pa_loop_write(daemon_pipe[1], &ok, sizeof(ok), NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
pa_core_unref(c);
|
||||
pa_log_info("Daemon startup complete.");
|
||||
|
||||
retval = 0;
|
||||
if (pa_mainloop_run(mainloop, &retval) < 0)
|
||||
goto finish;
|
||||
|
||||
pa_log_info("Daemon shutdown initiated.");
|
||||
|
||||
finish:
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
if (win32_timer)
|
||||
pa_mainloop_get_api(mainloop)->time_free(win32_timer);
|
||||
#endif
|
||||
|
||||
if (c) {
|
||||
pa_core_unref(c);
|
||||
pa_log_info("Daemon terminated.");
|
||||
}
|
||||
|
||||
if (!conf->no_cpu_limit)
|
||||
pa_cpu_limit_done();
|
||||
|
||||
pa_signal_done();
|
||||
|
||||
pa_log_info("Daemon terminated.");
|
||||
|
||||
finish:
|
||||
#ifdef HAVE_FORK
|
||||
pa_close_pipe(daemon_pipe);
|
||||
#endif
|
||||
|
||||
if (mainloop)
|
||||
pa_mainloop_free(mainloop);
|
||||
|
|
@ -837,8 +856,6 @@ finish:
|
|||
if (valid_pid_file)
|
||||
pa_pid_file_remove();
|
||||
|
||||
pa_close_pipe(daemon_pipe);
|
||||
|
||||
#ifdef OS_IS_WIN32
|
||||
WSACleanup();
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue