[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-292-ge8a5746

[Colin Guthrie]

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  f42022a7d3157a3f3346b49c749d2262abea34c4 (commit)

- Log -----------------------------------------------------------------
e8a5746 Add a configure option to change 'udevrulesdir'
978d33b Mark shared variables as volatile
-----------------------------------------------------------------------

Summary of changes:
 configure.ac                |    7 +++++++
 src/Makefile.am             |    1 -
 src/pulse/thread-mainloop.c |    5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit 978d33b609969c3b9bbbd759e0f11aaf856c80cf
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Sun Dec 6 12:20:53 2009 +0530

    Mark shared variables as volatile
    
    'n_waiting' and 'n_waiting_for_accept' may be accessed from mulitple
    threads, and thus need to be marked as volatile to suppres certain
    compiler optimisations. All uses are protected by a mutex, so we don't
    need to worry about cache issues (added documentation for this as well).
    
    This addresses bug #738.

diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index a2b98ce..14ed926 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -51,7 +51,7 @@
 
 struct pa_threaded_mainloop {
     pa_mainloop *real_mainloop;
-    int n_waiting, n_waiting_for_accept;
+    volatile int n_waiting, n_waiting_for_accept;
 
     pa_thread* thread;
     pa_mutex* mutex;
@@ -185,6 +185,7 @@ void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m) {
     pa_mutex_unlock(m->mutex);
 }
 
+/* Called with the lock taken */
 void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept) {
     pa_assert(m);
 
@@ -198,6 +199,7 @@ void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept) {
     }
 }
 
+/* Called with the lock taken */
 void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) {
     pa_assert(m);
 
@@ -212,6 +214,7 @@ void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) {
     m->n_waiting --;
 }
 
+/* Called with the lock taken */
 void pa_threaded_mainloop_accept(pa_threaded_mainloop *m) {
     pa_assert(m);
 

commit e8a5746f2fcae59bfd18d39b621509b3ef130453
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Sun Dec 6 12:31:25 2009 +0530

    Add a configure option to change 'udevrulesdir'
    
    This patch serves two purposes:
    
      1) Allows something other than the de-facto standard udev rules dir or
         /lib/udev/rules.d to be used (the udev build system allows you to
         customise this)
    
      2) Allows a prefixed, non-root install (right now, the /lib/... path
         is hard-coded into the build system

diff --git a/configure.ac b/configure.ac
index dfbd9bc..af60fff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1395,6 +1395,13 @@ AC_ARG_WITH(
 
 AC_SUBST(modlibexecdir)
 
+AC_ARG_WITH(
+        [udev-rules-dir],
+        AS_HELP_STRING([--with-udev-rules-dir],[Directory where to install udev rules to (defaults to /lib/udev/rules.d)]),
+        [udevrulesdir=$withval], [udevrulesdir="/lib/udev/rules.d"])
+
+AC_SUBST(udevrulesdir)
+
 AC_ARG_ENABLE(
         [force-preopen],
         AS_HELP_STRING([--enable-force-preopen],[Preopen modules, even when dlopen() is supported.]),
diff --git a/src/Makefile.am b/src/Makefile.am
index 3be2869..11826a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ pulselibexecdir=$(libexecdir)/pulse
 xdgautostartdir=$(sysconfdir)/xdg/autostart
 alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
 alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
-udevrulesdir=/lib/udev/rules.d
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
 
 ###################################

-- 
hooks/post-receive
PulseAudio Sound Server