[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-169-g1acf394
Lennart Poettering
gitmailer-noreply at 0pointer.de
Fri Aug 29 12:43:56 PDT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from ca38446e6b946ddbd25f122f4012f2b01d0e2338 (commit)
- Log -----------------------------------------------------------------
1acf394... change default log level for the library to PA_LOG_ERROR to avoid spamming to stderr more often
086fa95... downgrade a few messages
a45440d... the native atomic ops implementation for amd64 seems to work fine
-----------------------------------------------------------------------
Summary of changes:
src/daemon/main.c | 6 +++---
src/pulsecore/atomic.h | 6 +++---
src/pulsecore/authkey.c | 8 ++++----
src/pulsecore/log.c | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
commit a45440d5c952db69843cbf5bb3add8986305d139
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Aug 29 21:42:09 2008 +0200
the native atomic ops implementation for amd64 seems to work fine
diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
index a1afc07..23d5624 100644
--- a/src/pulsecore/atomic.h
+++ b/src/pulsecore/atomic.h
@@ -42,7 +42,7 @@
#error "Please include config.h before including this file!"
#endif
-#ifdef HAVE_ATOMIC_BUILTINS
+#if HAVE_ATOMIC_BUILTINS
/* __sync based implementation */
@@ -109,7 +109,7 @@ static inline pa_bool_t pa_atomic_ptr_cmpxchg(pa_atomic_ptr_t *a, void *old_p, v
#elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
-#error "The native atomic operations implementation for AMD64 has not been tested. libatomic_ops is known to not work properly on AMD64 and your gcc version is too old for the gcc-builtin atomic ops support. You have three options now: make the native atomic operations implementation for AMD64 work, fix libatomic_ops, or upgrade your GCC."
+#warn "The native atomic operations implementation for AMD64 has not been tested. libatomic_ops is known to not work properly on AMD64 and your gcc version is too old for the gcc-builtin atomic ops support. You have three options now: make the native atomic operations implementation for AMD64 work, fix libatomic_ops, or upgrade your GCC."
/* Addapted from glibc */
@@ -156,7 +156,7 @@ static inline pa_bool_t pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i)
: "=a" (result), "=m" (a->value)
: "r" (new_i), "m" (a->value), "0" (old_i));
- return result == oldval;
+ return result == old_i;
}
typedef struct pa_atomic_ptr {
commit 086fa95407b08204a459600eb33ae6c6c16eb5ce
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Aug 29 21:43:10 2008 +0200
downgrade a few messages
diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c
index f3f40f8..2f703be 100644
--- a/src/pulsecore/authkey.c
+++ b/src/pulsecore/authkey.c
@@ -88,7 +88,7 @@ static int load(const char *fn, void *data, size_t length) {
if ((fd = open(fn, O_RDWR|O_CREAT|O_BINARY|O_NOCTTY, S_IRUSR|S_IWUSR)) < 0) {
if (errno != EACCES || (fd = open(fn, O_RDONLY|O_BINARY|O_NOCTTY)) < 0) {
- pa_log("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
goto finish;
} else
writable = 0;
@@ -105,7 +105,7 @@ static int load(const char *fn, void *data, size_t length) {
pa_log_debug("Got %d bytes from cookie file '%s', expected %d", (int) r, fn, (int) length);
if (!writable) {
- pa_log("Unable to write cookie to read only file");
+ pa_log_warn("Unable to write cookie to read-only file");
goto finish;
}
@@ -140,7 +140,7 @@ int pa_authkey_load(const char *path, void *data, size_t length) {
pa_assert(length > 0);
if ((ret = load(path, data, length)) < 0)
- pa_log("Failed to load authorization key '%s': %s", path, (ret < 0) ? pa_cstrerror(errno) : "File corrupt");
+ pa_log_warn("Failed to load authorization key '%s': %s", path, (ret < 0) ? pa_cstrerror(errno) : "File corrupt");
return ret;
}
@@ -206,7 +206,7 @@ int pa_authkey_save(const char *fn, const void *data, size_t length) {
return -2;
if ((fd = open(p, O_RDWR|O_CREAT|O_NOCTTY, S_IRUSR|S_IWUSR)) < 0) {
- pa_log("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to open cookie file '%s': %s", fn, pa_cstrerror(errno));
goto finish;
}
commit 1acf39435655ea485c99cf6f328b2972efb730e8
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Aug 29 21:43:50 2008 +0200
change default log level for the library to PA_LOG_ERROR to avoid spamming to stderr more often
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 9f7a79d..1d2aa03 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -348,6 +348,9 @@ int main(int argc, char *argv[]) {
int autospawn_fd = -1;
pa_bool_t autospawn_locked = FALSE;
+ pa_log_set_maximal_level(PA_LOG_INFO);
+ pa_log_set_ident("pulseaudio");
+
#if defined(__linux__) && defined(__OPTIMIZE__)
/*
Disable lazy relocations to make usage of external libraries
@@ -410,9 +413,6 @@ int main(int argc, char *argv[]) {
setlocale(LC_ALL, "");
pa_init_i18n();
- pa_log_set_maximal_level(PA_LOG_INFO);
- pa_log_set_ident("pulseaudio");
-
conf = pa_daemon_conf_new();
if (pa_daemon_conf_load(conf, NULL) < 0)
diff --git a/src/pulsecore/log.c b/src/pulsecore/log.c
index 9507a85..5b79999 100644
--- a/src/pulsecore/log.c
+++ b/src/pulsecore/log.c
@@ -53,7 +53,7 @@
static char *log_ident = NULL, *log_ident_local = NULL;
static pa_log_target_t log_target = PA_LOG_STDERR;
static pa_log_func_t user_log_func = NULL;
-static pa_log_level_t maximal_level = PA_LOG_NOTICE;
+static pa_log_level_t maximal_level = PA_LOG_ERROR;
#ifdef HAVE_SYSLOG_H
static const int level_to_syslog[] = {
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list