From 12c5c62dadad248f4a01a9973b6e99c99d0badad Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 00:38:52 +0200 Subject: Downgrade hrtimer warning to notice level --- src/modules/module-alsa-sink.c | 2 +- src/modules/module-alsa-source.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index e3f9a5ff..6f0d7830 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -1241,7 +1241,7 @@ int pa__init(pa_module*m) { } if (use_tsched && !pa_rtclock_hrtimer()) { - pa_log("Disabling timer-based scheduling because high-resolution timers are not available from the kernel."); + pa_log_notice("Disabling timer-based scheduling because high-resolution timers are not available from the kernel."); use_tsched = FALSE; } diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index 54ffde57..fca05006 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -1073,7 +1073,7 @@ int pa__init(pa_module*m) { } if (use_tsched && !pa_rtclock_hrtimer()) { - pa_log("Disabling timer-based scheduling because high-resolution timers are not available from the kernel."); + pa_log_notice("Disabling timer-based scheduling because high-resolution timers are not available from the kernel."); use_tsched = FALSE; } -- cgit From 456284918ab04cde6c661839d706cb84baf3a887 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 00:39:36 +0200 Subject: update documentation and help texts for s32le/s32be sample types --- man/pacat.1.xml.in | 6 ++++-- man/pulse-daemon.conf.5.xml.in | 6 ++++-- src/utils/pacat.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/man/pacat.1.xml.in b/man/pacat.1.xml.in index 7b0d72b9..68a3a12a 100644 --- a/man/pacat.1.xml.in +++ b/man/pacat.1.xml.in @@ -108,9 +108,11 @@ USA.

Capture or play back audio with the specified sample format. Specify one of u8, s16le, - s16be, float32le, float32be, + s16be, s32le, + s32be, float32le, float32be, ulaw, alaw. Depending on the endianess of - the CPU the formats s16ne, s16re, + the CPU the + formats s16ne, s16re, s32ne, s32re, float32ne, float32re (for native, resp. reverse endian) are available as aliases. Defaults to s16ne.

 diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in index 50e24559..c2eefaa5 100644 --- a/man/pulse-daemon.conf.5.xml.in +++ b/man/pulse-daemon.conf.5.xml.in @@ -319,9 +319,11 @@ USA. diff --git a/src/utils/pacat.c b/src/utils/pacat.c index c1826d7b..f42abc8e 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -500,7 +500,7 @@ static void help(const char *argv0) { " --volume=VOLUME Specify the initial (linear) volume in range 0...65536\n" " --rate=SAMPLERATE The sample rate in Hz (defaults to 44100)\n" " --format=SAMPLEFORMAT The sample type, one of s16le, s16be, u8, float32le,\n" - " float32be, ulaw, alaw (defaults to s16ne)\n" + " float32be, ulaw, alaw, s32le, s32be (defaults to s16ne)\n" " --channels=CHANNELS The number of channels, 1 for mono, 2 for stereo\n" " (defaults to 2)\n" " --channel-map=CHANNELMAP Channel map to use instead of the default\n" -- cgit From 5a9a6021f12ebfcdc071d07488723ab8c0adfd5f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:28:08 +0200 Subject: update map-file script to ignore gcc malloc attributes --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index a20c7c45..3ee53722 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1625,7 +1625,7 @@ update-ffmpeg: update-map-file: ( echo "PULSE_0 {" ; \ echo "global:" ; \ - ctags -I PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulseinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ + ctags -I PA_GCC_MALLOC,PA_GCC_ALLOC_SIZE2,PA_GCC_ALLOC_SIZE,PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulseinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ echo "local:" ; \ echo "*;" ; \ echo "};" ) > $(srcdir)/map-file -- cgit From cb0c97dae7655eda60cabc06df0d1da4666392ec Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:29:07 +0200 Subject: add new API function pa_channel_map_compatible() --- src/pulse/channelmap.c | 7 +++++++ src/pulse/channelmap.h | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 1766e729..7a21998e 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -560,3 +560,10 @@ int pa_channel_map_valid(const pa_channel_map *map) { return 1; } + +int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *ss) { + pa_assert(map); + pa_assert(ss); + + return map->channels == ss->channels; +} diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h index f9086d19..035f9b1a 100644 --- a/src/pulse/channelmap.h +++ b/src/pulse/channelmap.h @@ -214,6 +214,10 @@ int pa_channel_map_equal(const pa_channel_map *a, const pa_channel_map *b) PA_GC /** Return non-zero of the specified channel map is considered valid */ int pa_channel_map_valid(const pa_channel_map *map) PA_GCC_PURE; +/** Return non-zero if the specified channel map is compatible with + * the specified sample spec. \since 0.9.12 */ +int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *ss) PA_GCC_PURE; + PA_C_DECL_END #endif -- cgit From ece297f21b627dfb71e853a57dcacbd1bd5217bb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:29:24 +0200 Subject: update map file --- src/map-file | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/map-file b/src/map-file index b6d3b63d..67a5ee36 100644 --- a/src/map-file +++ b/src/map-file @@ -9,6 +9,7 @@ pa_browser_unref; pa_bytes_per_second; pa_bytes_snprint; pa_bytes_to_usec; +pa_channel_map_compatible; pa_channel_map_equal; pa_channel_map_init; pa_channel_map_init_auto; @@ -98,6 +99,7 @@ pa_context_unref; pa_cvolume_avg; pa_cvolume_channels_equal_to; pa_cvolume_equal; +pa_cvolume_max; pa_cvolume_remap; pa_cvolume_set; pa_cvolume_snprint; -- cgit From 34290725043274ddc88aeb203892f3d8bb7bbecf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:30:25 +0200 Subject: introduce upper channel map definition limit PA_CHANNEL_MAP_DEF_MAX --- src/pulse/channelmap.c | 4 +++- src/pulse/channelmap.h | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 7a21998e..7df6d6df 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -198,6 +198,7 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p pa_assert(m); pa_assert(channels > 0); pa_assert(channels <= PA_CHANNELS_MAX); + pa_assert(def < PA_CHANNEL_MAP_DEF_MAX); pa_channel_map_init(m); @@ -391,7 +392,7 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p default: - return NULL; + pa_assert_not_reached(); } } @@ -401,6 +402,7 @@ pa_channel_map* pa_channel_map_init_extend(pa_channel_map *m, unsigned channels, pa_assert(m); pa_assert(channels > 0); pa_assert(channels <= PA_CHANNELS_MAX); + pa_assert(def < PA_CHANNEL_MAP_DEF_MAX); pa_channel_map_init(m); diff --git a/src/pulse/channelmap.h b/src/pulse/channelmap.h index 035f9b1a..d2dd6f8f 100644 --- a/src/pulse/channelmap.h +++ b/src/pulse/channelmap.h @@ -157,6 +157,9 @@ typedef enum pa_channel_map_def { PA_CHANNEL_MAP_OSS, /**< The default channel mapping used by OSS as defined in the OSS 4.0 API specs */ + /**< Upper limit of valid channel mapping definitions */ + PA_CHANNEL_MAP_DEF_MAX, + PA_CHANNEL_MAP_DEFAULT = PA_CHANNEL_MAP_AIFF /**< The default channel map */ } pa_channel_map_def_t; @@ -211,7 +214,7 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *map, const char *s); /** Compare two channel maps. Return 1 if both match. */ int pa_channel_map_equal(const pa_channel_map *a, const pa_channel_map *b) PA_GCC_PURE; -/** Return non-zero of the specified channel map is considered valid */ +/** Return non-zero if the specified channel map is considered valid */ int pa_channel_map_valid(const pa_channel_map *map) PA_GCC_PURE; /** Return non-zero if the specified channel map is compatible with -- cgit From b56f344b97e9520828a76cf54d81663fa48cbd33 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:30:48 +0200 Subject: a few minor clean-ups --- src/pulse/channelmap.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 7df6d6df..37308751 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -288,9 +288,6 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p case PA_CHANNEL_MAP_AUX: { unsigned i; - if (channels >= PA_CHANNELS_MAX) - return NULL; - for (i = 0; i < channels; i++) m->map[i] = PA_CHANNEL_POSITION_AUX0 + i; @@ -491,7 +488,7 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) { pa_assert(rmap); pa_assert(s); - memset(&map, 0, sizeof(map)); + pa_channel_map_init(&map); if (strcmp(s, "stereo") == 0) { map.channels = 2; @@ -554,11 +551,9 @@ int pa_channel_map_valid(const pa_channel_map *map) { if (map->channels <= 0 || map->channels > PA_CHANNELS_MAX) return 0; - for (c = 0; c < map->channels; c++) { - - if (map->map[c] < 0 ||map->map[c] >= PA_CHANNEL_POSITION_MAX) + for (c = 0; c < map->channels; c++) + if (map->map[c] < 0 || map->map[c] >= PA_CHANNEL_POSITION_MAX) return 0; - } return 1; } -- cgit From 3f6f13f90227d1adfe39b56671aa34745778f35d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:31:17 +0200 Subject: use pa_channel_map_compatible() where applicable --- src/utils/pacat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/pacat.c b/src/utils/pacat.c index f42abc8e..76aea36a 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -695,7 +695,7 @@ int main(int argc, char *argv[]) { goto quit; } - if (channel_map_set && channel_map.channels != sample_spec.channels) { + if (channel_map_set && pa_channel_map_compatible(&channel_map, &sample_spec)) { fprintf(stderr, _("Channel map doesn't match sample specification\n")); goto quit; } -- cgit From a609e4a700da10926fcb9c9633dee1342907de97 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:31:39 +0200 Subject: check for errors returned by pa_context_connect() --- src/utils/pacat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/utils/pacat.c b/src/utils/pacat.c index 76aea36a..99df5b9e 100644 --- a/src/utils/pacat.c +++ b/src/utils/pacat.c @@ -773,7 +773,10 @@ int main(int argc, char *argv[]) { pa_context_set_state_callback(context, context_state_callback, NULL); /* Connect the context */ - pa_context_connect(context, server, 0, NULL); + if (pa_context_connect(context, server, 0, NULL) < 0) { + fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context))); + goto quit; + } if (verbose) { struct timeval tv; -- cgit From f52fb64313fd423cd085f7b53ce5663c0c17d382 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 03:17:48 +0200 Subject: if we are exiting due to idleness, say so --- src/pulsecore/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index b9f04b68..6f8a2929 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -204,6 +204,7 @@ static void exit_callback(pa_mainloop_api*m, pa_time_event *e, const struct time pa_core *c = userdata; pa_assert(c->exit_event == e); + pa_log_info("We are idle, quitting..."); pa_core_exit(c, TRUE, 0); } -- cgit From 89ed50750e46486ba06638f15f3bb32e92e5c903 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 03:18:36 +0200 Subject: if we are exiting due to cpu overload, say so via syslog, too --- src/daemon/cpulimit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c index 59552828..a909600e 100644 --- a/src/daemon/cpulimit.c +++ b/src/daemon/cpulimit.c @@ -167,6 +167,8 @@ static void callback(pa_mainloop_api*m, pa_io_event*e, int fd, pa_io_event_flags pa_assert(e == io_event); pa_assert(fd == the_pipe[0]); + pa_log("Recevied request to terminate due to CPU overload."); + pa_read(the_pipe[0], &c, sizeof(c), NULL); m->quit(m, 1); /* Quit the main loop */ } -- cgit From 994ff984f04740e6817f3eb7b725e3825f3d290c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 03:20:33 +0200 Subject: connect to localhost via IP address instead of host name, to avoid needless NSS lookup --- src/pulse/context.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pulse/context.c b/src/pulse/context.c index f1aa4987..723980e1 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -905,8 +905,9 @@ int pa_context_connect( pa_xfree(d); } - c->server_list = pa_strlist_prepend(c->server_list, "tcp6:localhost"); - c->server_list = pa_strlist_prepend(c->server_list, "tcp4:localhost"); + /* Add TCP/IP on the localhost */ + c->server_list = pa_strlist_prepend(c->server_list, "tcp6:[::1]"); + c->server_list = pa_strlist_prepend(c->server_list, "tcp4:127.0.0.1"); /* The system wide instance */ c->server_list = pa_strlist_prepend(c->server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET); -- cgit From fb837f0cac00d0207f84c9e68e1f7c2d6cd33a51 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 03:22:13 +0200 Subject: rework autospawning to allow to multiple parallel autospawning contexts --- src/pulse/context.c | 313 ++++++++++++++++++--------------------------------- src/pulse/internal.h | 3 - 2 files changed, 107 insertions(+), 209 deletions(-) diff --git a/src/pulse/context.c b/src/pulse/context.c index 723980e1..154e5faf 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -98,26 +97,6 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_SUBSCRIBE_EVENT] = pa_command_subscribe_event, [PA_COMMAND_EXTENSION] = pa_command_extension }; - -static void unlock_autospawn(pa_context *c) { - pa_assert(c); - - if (c->autospawn_fd >= 0) { - - if (c->autospawn_locked) - pa_autospawn_lock_release(); - - if (c->autospawn_event) - c->mainloop->io_free(c->autospawn_event); - - pa_autospawn_lock_done(FALSE); - } - - c->autospawn_locked = FALSE; - c->autospawn_fd = -1; - c->autospawn_event = NULL; -} - static void context_free(pa_context *c); pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) { @@ -180,9 +159,6 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char * c->do_shm = FALSE; c->do_autospawn = FALSE; - c->autospawn_fd = -1; - c->autospawn_locked = FALSE; - c->autospawn_event = NULL; memset(&c->spawn_api, 0, sizeof(c->spawn_api)); #ifndef MSG_NOSIGNAL @@ -252,8 +228,6 @@ static void context_free(pa_context *c) { context_unlink(c); - unlock_autospawn(c); - if (c->record_streams) pa_dynarray_free(c->record_streams, NULL, NULL); if (c->playback_streams) @@ -577,31 +551,89 @@ static void setup_context(pa_context *c, pa_iochannel *io) { pa_context_unref(c); } -static void on_connection(pa_socket_client *client, pa_iochannel*io, void *userdata); +static char *get_old_legacy_runtime_dir(void) { + char *p, u[128]; + struct stat st; -#ifndef OS_IS_WIN32 + if (!pa_get_user_name(u, sizeof(u))) + return NULL; -static int context_connect_spawn(pa_context *c) { - pid_t pid; - int status, r; - int fds[2] = { -1, -1} ; - pa_iochannel *io; + p = pa_sprintf_malloc("/tmp/pulse-%s", u); - if (getuid() == 0) - return -1; + if (stat(p, &st) < 0) { + pa_xfree(p); + return NULL; + } - pa_context_ref(c); + if (st.st_uid != getuid()) { + pa_xfree(p); + return NULL; + } - if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) < 0) { - pa_log_error(_("socketpair(): %s"), pa_cstrerror(errno)); - pa_context_fail(c, PA_ERR_INTERNAL); - goto fail; + return p; +} + +static char *get_very_old_legacy_runtime_dir(void) { + char *p, h[128]; + struct stat st; + + if (!pa_get_home_dir(h, sizeof(h))) + return NULL; + + p = pa_sprintf_malloc("%s/.pulse", h); + + if (stat(p, &st) < 0) { + pa_xfree(p); + return NULL; + } + + if (st.st_uid != getuid()) { + pa_xfree(p); + return NULL; + } + + return p; +} + + +static pa_strlist *prepend_per_user(pa_strlist *l) { + char *ufn; + static char *legacy_dir; + + /* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */ + if ((legacy_dir = get_very_old_legacy_runtime_dir())) { + char *p = pa_sprintf_malloc("%s" PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET, legacy_dir); + l = pa_strlist_prepend(l, p); + pa_xfree(p); + pa_xfree(legacy_dir); + } + + /* The old per-user instance path (< 0.9.12). This is supported only to ease upgrades */ + if ((legacy_dir = get_old_legacy_runtime_dir())) { + char *p = pa_sprintf_malloc("%s" PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET, legacy_dir); + l = pa_strlist_prepend(l, p); + pa_xfree(p); + pa_xfree(legacy_dir); } - pa_make_fd_cloexec(fds[0]); + /* The per-user instance */ + if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) { + l = pa_strlist_prepend(l, ufn); + pa_xfree(ufn); + } + + return l; +} - pa_make_socket_low_delay(fds[0]); - pa_make_socket_low_delay(fds[1]); +#ifndef OS_IS_WIN32 + +static int context_autospawn(pa_context *c) { + pid_t pid; + int status, r; + + pa_log_debug("Trying to autospawn..."); + + pa_context_ref(c); if (c->spawn_api.prefork) c->spawn_api.prefork(); @@ -617,31 +649,22 @@ static int context_connect_spawn(pa_context *c) { } else if (!pid) { /* Child */ - char t[128]; const char *state = NULL; #define MAX_ARGS 64 const char * argv[MAX_ARGS+1]; int n; - char *f; - - pa_close_all(fds[1], -1); - - f = pa_sprintf_malloc("%i", fds[1]); - pa_set_env("PULSE_PASSED_FD", f); - pa_xfree(f); if (c->spawn_api.atfork) c->spawn_api.atfork(); + pa_close_all(-1); + /* Setup argv */ n = 0; argv[n++] = c->conf->daemon_binary; - argv[n++] = "--daemonize=yes"; - - pa_snprintf(t, sizeof(t), "-Lmodule-native-protocol-fd fd=%i", fds[1]); - argv[n++] = strdup(t); + argv[n++] = "--start"; while (n < MAX_ARGS) { char *a; @@ -661,14 +684,13 @@ static int context_connect_spawn(pa_context *c) { /* Parent */ - pa_assert_se(pa_close(fds[1]) == 0); - fds[1] = -1; - - r = waitpid(pid, &status, 0); - if (c->spawn_api.postfork) c->spawn_api.postfork(); + do { + r = waitpid(pid, &status, 0); + } while (r < 0 && errno == EINTR); + if (r < 0) { pa_log(_("waitpid(): %s"), pa_cstrerror(errno)); pa_context_fail(c, PA_ERR_INTERNAL); @@ -678,21 +700,11 @@ static int context_connect_spawn(pa_context *c) { goto fail; } - c->is_local = TRUE; - - unlock_autospawn(c); - - io = pa_iochannel_new(c->mainloop, fds[0], fds[0]); - setup_context(c, io); - pa_context_unref(c); return 0; fail: - pa_close_pipe(fds); - - unlock_autospawn(c); pa_context_unref(c); @@ -701,6 +713,8 @@ fail: #endif /* OS_IS_WIN32 */ +static void on_connection(pa_socket_client *client, pa_iochannel*io, void *userdata); + static int try_next_connection(pa_context *c) { char *u = NULL; int r = -1; @@ -718,8 +732,18 @@ static int try_next_connection(pa_context *c) { #ifndef OS_IS_WIN32 if (c->do_autospawn) { - r = context_connect_spawn(c); - goto finish; + + if ((r = context_autospawn(c)) < 0) + goto finish; + + /* Autospawn only once */ + c->do_autospawn = FALSE; + + /* Connect only to per-user sockets this time */ + c->server_list = prepend_per_user(c->server_list); + + /* Retry connection */ + continue; } #endif @@ -774,91 +798,12 @@ static void on_connection(pa_socket_client *client, pa_iochannel*io, void *userd goto finish; } - unlock_autospawn(c); setup_context(c, io); finish: pa_context_unref(c); } -static void autospawn_cb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) { - pa_context *c = userdata; - int k; - - pa_assert(a); - pa_assert(e); - pa_assert(fd >= 0); - pa_assert(events == PA_IO_EVENT_INPUT); - pa_assert(c); - pa_assert(e == c->autospawn_event); - pa_assert(fd == c->autospawn_fd); - - pa_context_ref(c); - - /* Check whether we can get the lock right now*/ - if ((k = pa_autospawn_lock_acquire(FALSE)) < 0) { - pa_context_fail(c, PA_ERR_ACCESS); - goto finish; - } - - if (k > 0) { - /* So we got it, rock on! */ - c->autospawn_locked = TRUE; - try_next_connection(c); - - c->mainloop->io_free(c->autospawn_event); - c->autospawn_event = NULL; - } - -finish: - - pa_context_unref(c); -} - -static char *get_old_legacy_runtime_dir(void) { - char *p, u[128]; - struct stat st; - - if (!pa_get_user_name(u, sizeof(u))) - return NULL; - - p = pa_sprintf_malloc("/tmp/pulse-%s", u); - - if (stat(p, &st) < 0) { - pa_xfree(p); - return NULL; - } - - if (st.st_uid != getuid()) { - pa_xfree(p); - return NULL; - } - - return p; -} - -static char *get_very_old_legacy_runtime_dir(void) { - char *p, h[128]; - struct stat st; - - if (!pa_get_home_dir(h, sizeof(h))) - return NULL; - - p = pa_sprintf_malloc("%s/.pulse", h); - - if (stat(p, &st) < 0) { - pa_xfree(p); - return NULL; - } - - if (st.st_uid != getuid()) { - pa_xfree(p); - return NULL; - } - - return p; -} - int pa_context_connect( pa_context *c, const char *server, @@ -888,11 +833,11 @@ int pa_context_connect( } } else { - char *d, *ufn; - static char *legacy_dir; + char *d; /* Prepend in reverse order */ + /* Follow the X display */ if ((d = getenv("DISPLAY"))) { char *e; d = pa_xstrdup(d); @@ -909,67 +854,23 @@ int pa_context_connect( c->server_list = pa_strlist_prepend(c->server_list, "tcp6:[::1]"); c->server_list = pa_strlist_prepend(c->server_list, "tcp4:127.0.0.1"); - /* The system wide instance */ + /* The system wide instance via PF_LOCAL */ c->server_list = pa_strlist_prepend(c->server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET); - /* The very old per-user instance path (< 0.9.11). This is supported only to ease upgrades */ - if ((legacy_dir = get_very_old_legacy_runtime_dir())) { - char *p = pa_sprintf_malloc("%s" PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET, legacy_dir); - c->server_list = pa_strlist_prepend(c->server_list, p); - pa_xfree(p); - pa_xfree(legacy_dir); - } + /* The user instance via PF_LOCAL */ + c->server_list = prepend_per_user(c->server_list); - /* The old per-user instance path (< 0.9.12). This is supported only to ease upgrades */ - if ((legacy_dir = get_old_legacy_runtime_dir())) { - char *p = pa_sprintf_malloc("%s" PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET, legacy_dir); - c->server_list = pa_strlist_prepend(c->server_list, p); - pa_xfree(p); - pa_xfree(legacy_dir); - } - - /* The per-user instance */ - if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) { - c->server_list = pa_strlist_prepend(c->server_list, ufn); - pa_xfree(ufn); - } - - /* Wrap the connection attempts in a single transaction for sane autospawn locking */ + /* Set up autospawning */ if (!(flags & PA_CONTEXT_NOAUTOSPAWN) && c->conf->autospawn) { - int k; - - pa_assert(c->autospawn_fd < 0); - pa_assert(!c->autospawn_locked); - /* Start the locking procedure */ - if ((c->autospawn_fd = pa_autospawn_lock_init()) < 0) { - pa_context_fail(c, PA_ERR_ACCESS); - goto finish; - } - - if (api) - c->spawn_api = *api; - - c->do_autospawn = TRUE; - - /* Check whether we can get the lock right now*/ - if ((k = pa_autospawn_lock_acquire(FALSE)) < 0) { - pa_context_fail(c, PA_ERR_ACCESS); - goto finish; - } - - if (k > 0) - /* So we got it, rock on! */ - c->autospawn_locked = TRUE; + if (getuid() == 0) + pa_log_debug("Not doing autospawn since we are root."); else { - /* Hmm, we didn't get it, so let's wait for it */ - c->autospawn_event = c->mainloop->io_new(c->mainloop, c->autospawn_fd, PA_IO_EVENT_INPUT, autospawn_cb, c); + c->do_autospawn = TRUE; - pa_context_set_state(c, PA_CONTEXT_CONNECTING); - r = 0; - goto finish; + if (api) + c->spawn_api = *api; } - } } diff --git a/src/pulse/internal.h b/src/pulse/internal.h index 9167bf1b..5fe4210e 100644 --- a/src/pulse/internal.h +++ b/src/pulse/internal.h @@ -78,9 +78,6 @@ struct pa_context { pa_bool_t do_shm:1; pa_bool_t do_autospawn:1; - pa_bool_t autospawn_locked:1; - int autospawn_fd; - pa_io_event *autospawn_event; pa_spawn_api spawn_api; pa_strlist *server_list; -- cgit From 33d349dcbbef0952e9e59ca105e08fdff5454803 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 15:42:39 +0300 Subject: include build and runtime host information in debug output --- src/daemon/main.c | 9 +++++++-- src/pulsecore/core-util.c | 8 ++++++++ src/pulsecore/core-util.h | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/daemon/main.c b/src/daemon/main.c index c8eda398..bb8af444 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -778,8 +778,15 @@ int main(int argc, char *argv[]) { pa_set_env("PULSE_SYSTEM", conf->system_instance ? "1" : "0"); pa_log_info(_("This is PulseAudio %s"), PACKAGE_VERSION); + pa_log_debug(_("Compilation host: %s"), CANONICAL_HOST); pa_log_debug(_("Compilation CFLAGS: %s"), PA_CFLAGS); + s = pa_uname_string(); + pa_log_debug(_("Running on host: %s"), s); + pa_xfree(s); + + pa_log_info(_("Page size is %lu bytes"), (unsigned long) PA_PAGE_SIZE); + #ifdef HAVE_VALGRIND_MEMCHECK_H pa_log_debug(_("Compiled with Valgrind support: yes")); #else @@ -792,8 +799,6 @@ int main(int argc, char *argv[]) { pa_log_debug(_("Optimized build: no")); #endif - pa_log_info(_("Page size is %lu bytes"), (unsigned long) PA_PAGE_SIZE); - if (!(s = pa_machine_id())) { pa_log(_("Failed to get machine ID")); goto finish; diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index ad00f4f4..3e5ea492 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -42,6 +42,7 @@ #include #include #include +#include #ifdef HAVE_STRTOF_L #include @@ -2445,5 +2446,12 @@ char *pa_machine_id(void) { /* If no hostname was set we use the POSIX hostid. It's usually * the IPv4 address. Mit not be that stable. */ return pa_sprintf_malloc("%08lx", (unsigned long) gethostid); +} + +char *pa_uname_string(void) { + struct utsname u; + + pa_assert_se(uname(&u) == 0); + return pa_sprintf_malloc("%s %s %s %s", u.sysname, u.machine, u.release, u.version); } diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h index c9e307f5..df8ce3f8 100644 --- a/src/pulsecore/core-util.h +++ b/src/pulsecore/core-util.h @@ -191,5 +191,6 @@ pa_bool_t pa_in_system_mode(void); #define pa_streq(a,b) (!strcmp((a),(b))) char *pa_machine_id(void); +char *pa_uname_string(void); #endif -- cgit From f2164023fd0fda8c1a456c5c2f144f8943c24db9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 16:04:42 +0300 Subject: Add new option to disable remixing from/to LFE and set it to on by default --- man/pulse-daemon.conf.5.xml.in | 10 ++++++++++ src/daemon/daemon-conf.c | 36 ++++++++++++++++++++---------------- src/daemon/daemon-conf.h | 1 + src/daemon/daemon.conf.in | 1 + src/daemon/main.c | 1 + src/pulsecore/core.c | 1 + src/pulsecore/core.h | 1 + src/pulsecore/resampler.c | 8 ++++++-- src/pulsecore/resampler.h | 7 ++++--- src/pulsecore/sink-input.c | 3 ++- src/pulsecore/source-output.c | 3 ++- 11 files changed, 49 insertions(+), 23 deletions(-) diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in index c2eefaa5..ed158dfa 100644 --- a/man/pulse-daemon.conf.5.xml.in +++ b/man/pulse-daemon.conf.5.xml.in @@ -105,6 +105,16 @@ USA. matching only.

+ +