-/* $Id$ */
-
/***
This file is part of PulseAudio.
PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2 of the License,
+ by the Free Software Foundation; either version 2.1 of the License,
or (at your option) any later version.
PulseAudio is distributed in the hope that it will be useful, but
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <fcntl.h>
-#include <dirent.h>
-
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
+#include <pulse/xmalloc.h>
#include <pulsecore/module.h>
#include <pulsecore/core.h>
-#include <pulsecore/llist.h>
#include <pulsecore/core-util.h>
#include <pulsecore/log.h>
#include <pulse/mainloop-api.h>
-#include <pulse/xmalloc.h>
#include <pulsecore/core-error.h>
+#include <pulsecore/start-child.h>
#include "module-gconf-symdef.h"
-PA_MODULE_AUTHOR("Lennart Poettering")
-PA_MODULE_DESCRIPTION("GConf Adapter")
-PA_MODULE_VERSION(PACKAGE_VERSION)
-PA_MODULE_USAGE("")
+PA_MODULE_AUTHOR("Lennart Poettering");
+PA_MODULE_DESCRIPTION("GConf Adapter");
+PA_MODULE_VERSION(PACKAGE_VERSION);
+PA_MODULE_LOAD_ONCE(true);
#define MAX_MODULES 10
#define BUF_MAX 2048
-/* #undef PA_GCONF_HELPER */
-/* #define PA_GCONF_HELPER "/home/lennart/projects/pulseaudio/src/gconf-helper" */
+struct userdata;
struct module_item {
char *name;
};
struct module_info {
+ struct userdata *userdata;
char *name;
struct module_item items[MAX_MODULES];
if ((r = pa_read(u->fd, u->buf + u->buf_fill, BUF_MAX - u->buf_fill, &u->fd_type)) <= 0)
return -1;
- u->buf_fill += r;
+ u->buf_fill += (size_t) r;
return 0;
}
if ((e = memchr(u->buf, 0, u->buf_fill))) {
char *ret = pa_xstrdup(u->buf);
- u->buf_fill -= e - u->buf +1;
+ u->buf_fill -= (size_t) (e - u->buf +1);
memmove(u->buf, e+1, u->buf_fill);
return ret;
}
}
}
-static void unload_one_module(struct userdata *u, struct module_info*m, unsigned i) {
- pa_assert(u);
+static void unload_one_module(struct module_info *m, unsigned i) {
+ struct userdata *u;
+
pa_assert(m);
pa_assert(i < m->n_items);
+ u = m->userdata;
+
if (m->items[i].index == PA_INVALID_INDEX)
return;
pa_log_debug("Unloading module #%i", m->items[i].index);
- pa_module_unload_by_index(u->core, m->items[i].index);
+ pa_module_unload_by_index(u->core, m->items[i].index, true);
m->items[i].index = PA_INVALID_INDEX;
pa_xfree(m->items[i].name);
pa_xfree(m->items[i].args);
m->items[i].name = m->items[i].args = NULL;
}
-static void unload_all_modules(struct userdata *u, struct module_info*m) {
+static void unload_all_modules(struct module_info *m) {
unsigned i;
- pa_assert(u);
pa_assert(m);
for (i = 0; i < m->n_items; i++)
- unload_one_module(u, m, i);
+ unload_one_module(m, i);
m->n_items = 0;
}
static void load_module(
- struct userdata *u,
struct module_info *m,
- int i,
+ unsigned i,
const char *name,
const char *args,
- int is_new) {
+ bool is_new) {
+ struct userdata *u;
pa_module *mod;
- pa_assert(u);
pa_assert(m);
pa_assert(name);
pa_assert(args);
+ u = m->userdata;
+
if (!is_new) {
if (m->items[i].index != PA_INVALID_INDEX &&
- strcmp(m->items[i].name, name) == 0 &&
- strcmp(m->items[i].args, args) == 0)
+ pa_streq(m->items[i].name, name) &&
+ pa_streq(m->items[i].args, args))
return;
- unload_one_module(u, m, i);
+ unload_one_module(m, i);
}
pa_log_debug("Loading module '%s' with args '%s' due to GConf configuration.", name, args);
m->items[i].index = mod->index;
}
-static void module_info_free(void *p, void *userdata) {
+static void module_info_free(void *p) {
struct module_info *m = p;
- struct userdata *u = userdata;
pa_assert(m);
- pa_assert(u);
- unload_all_modules(u, m);
+ unload_all_modules(m);
pa_xfree(m->name);
pa_xfree(m);
}
int ret = 0;
do {
- if ((opcode = read_byte(u)) < 0)
+ if ((opcode = read_byte(u)) < 0) {
+ if (errno == EINTR || errno == EAGAIN)
+ break;
goto fail;
+ }
switch (opcode) {
case '!':
if (!(m = pa_hashmap_get(u->module_infos, name))) {
m = pa_xnew(struct module_info, 1);
+ m->userdata = u;
m->name = name;
m->n_items = 0;
pa_hashmap_put(u->module_infos, m->name, m);
goto fail;
}
- load_module(u, m, i, module, args, i >= m->n_items);
+ load_module(m, i, module, args, i >= m->n_items);
i++;
/* Unload all removed modules */
for (j = i; j < m->n_items; j++)
- unload_one_module(u, m, j);
+ unload_one_module(m, j);
m->n_items = i;
if (!(name = read_string(u)))
goto fail;
- if ((m = pa_hashmap_get(u->module_infos, name))) {
- pa_hashmap_remove(u->module_infos, name);
- module_info_free(m, u);
- }
-
+ pa_hashmap_remove_and_free(u->module_infos, name);
pa_xfree(name);
break;
u->io_event = NULL;
}
- pa_module_unload_request(u->module);
- }
-}
-
-static int start_client(const char *n, pid_t *pid) {
- pid_t child;
- int pipe_fds[2] = { -1, -1 };
-
- if (pipe(pipe_fds) < 0) {
- pa_log("pipe() failed: %s", pa_cstrerror(errno));
- goto fail;
- }
-
- if ((child = fork()) == (pid_t) -1) {
- pa_log("fork() failed: %s", pa_cstrerror(errno));
- goto fail;
- } else if (child != 0) {
-
- /* Parent */
- close(pipe_fds[1]);
-
- if (pid)
- *pid = child;
-
- return pipe_fds[0];
- } else {
-#ifdef __linux__
- DIR* d;
-#endif
- int max_fd, i;
- /* child */
-
- close(pipe_fds[0]);
- dup2(pipe_fds[1], 1);
-
- if (pipe_fds[1] != 1)
- close(pipe_fds[1]);
-
- close(0);
- open("/dev/null", O_RDONLY);
-
- close(2);
- open("/dev/null", O_WRONLY);
-
-#ifdef __linux__
-
- if ((d = opendir("/proc/self/fd/"))) {
-
- struct dirent *de;
-
- while ((de = readdir(d))) {
- char *e;
- int fd;
-
- errno = 0;
- fd = strtol(de->d_name, &e, 10);
- pa_assert(errno == 0 && *e == 0);
-
- if (fd >= 3)
- close(fd);
- }
-
- closedir(d);
- } else {
-
-#endif
-
- max_fd = 1024;
-
-#ifdef HAVE_SYS_RESOURCE_H
- {
- struct rlimit r;
- if (getrlimit(RLIMIT_NOFILE, &r) == 0)
- max_fd = r.rlim_max;
- }
-#endif
-
- for (i = 3; i < max_fd; i++)
- close(i);
-#
-#ifdef __linux__
- }
-#endif
-
-#ifdef PR_SET_PDEATHSIG
- /* On Linux we can use PR_SET_PDEATHSIG to have the helper
- process killed when the daemon dies abnormally. On non-Linux
- machines the client will die as soon as it writes data to
- stdout again (SIGPIPE) */
-
- prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
-#endif
-
-#ifdef SIGPIPE
- /* Make sure that SIGPIPE kills the child process */
- signal(SIGPIPE, SIG_DFL);
-#endif
-
- execl(n, n, NULL);
- _exit(1);
+ pa_module_unload_request(u->module, true);
}
-
-fail:
- if (pipe_fds[0] >= 0)
- close(pipe_fds[0]);
-
- if (pipe_fds[1] >= 0)
- close(pipe_fds[1]);
-
- return -1;
}
int pa__init(pa_module*m) {
u->core = m->core;
u->module = m;
m->userdata = u;
- u->module_infos = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+ u->module_infos = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) module_info_free);
u->pid = (pid_t) -1;
u->fd = -1;
u->fd_type = 0;
u->io_event = NULL;
u->buf_fill = 0;
- if ((u->fd = start_client(PA_GCONF_HELPER, &u->pid)) < 0)
+ if ((u->fd = pa_start_child_for_read(
+#if defined(__linux__) && !defined(__OPTIMIZE__)
+ pa_run_from_build_tree() ? PA_BUILDDIR "/gconf-helper" :
+#endif
+ PA_GCONF_HELPER, NULL, &u->pid)) < 0)
goto fail;
u->io_event = m->core->mainloop->io_new(
if (!(u = m->userdata))
return;
+ if (u->pid != (pid_t) -1) {
+ kill(u->pid, SIGTERM);
+
+ for (;;) {
+ if (waitpid(u->pid, NULL, 0) >= 0)
+ break;
+
+ if (errno != EINTR) {
+ pa_log("waitpid() failed: %s", pa_cstrerror(errno));
+ break;
+ }
+ }
+ }
+
if (u->io_event)
m->core->mainloop->io_free(u->io_event);
if (u->fd >= 0)
- close(u->fd);
-
- if (u->pid != (pid_t) -1) {
- kill(u->pid, SIGTERM);
- waitpid(u->pid, NULL, 0);
- }
+ pa_close(u->fd);
if (u->module_infos)
- pa_hashmap_free(u->module_infos, module_info_free, u);
+ pa_hashmap_free(u->module_infos);
pa_xfree(u);
}
-