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

[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  71cb35691ca0ea48dc559a69a554e02dd2ae30f5 (commit)

- Log -----------------------------------------------------------------
1cbacea alsa: Sprinkle some PA_UNLIKELYs around error checks
811ea4d man: Remove repeated lines
-----------------------------------------------------------------------

Summary of changes:
 man/pactl.1.xml.in           |    6 ------
 src/modules/alsa/alsa-util.c |   21 ++++++++++-----------
 2 files changed, 10 insertions(+), 17 deletions(-)

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

commit 811ea4ded8e0058072cb83a89b3df657e4a8f93c
Author: Wanming.Zhang at tieto.com <Wanming.Zhang at tieto.com>
Date:   Thu Nov 18 04:17:36 2010 +0200

    man: Remove repeated lines
    
    From 3c18dbe5889816792db27c9a7253a83687d68ee9 Mon Sep 17 00:00:00 2001
    From: Zhang Wanming <wanming.zhang at tieto.com>
    Date: Thu, 18 Nov 2010 10:03:39 +0800
    Subject: [PATCH] man: Remove repeated lines
    
    Signed-off-by: Zhang Wanming <wanming.zhang at tieto.com>

diff --git a/man/pactl.1.xml.in b/man/pactl.1.xml.in
index 8d5bf1d..7ba768a 100644
--- a/man/pactl.1.xml.in
+++ b/man/pactl.1.xml.in
@@ -143,12 +143,6 @@ USA.
     </option>
 
     <option>
-      <p><opt>unload-module</opt> <arg>ID</arg></p>
-
-      <optdesc><p>Unload the module instance identified by the specified numeric index.</p></optdesc>
-    </option>
-
-    <option>
       <p><opt>suspend-sink</opt> <arg>SINK</arg> <arg>1|0</arg></p>
 
       <optdesc><p>Suspend or resume the specified sink (which my be

commit 1cbacead13ec3bb7af045fd6fe9599f40756defd
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Thu Nov 18 10:02:10 2010 +0530

    alsa: Sprinkle some PA_UNLIKELYs around error checks
    
    This just adds a few PA_UNLIKELY macros around some error paths in
    frequently called code.

diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
index 7ea26e1..5a726ff 100644
--- a/src/modules/alsa/alsa-util.c
+++ b/src/modules/alsa/alsa-util.c
@@ -1102,8 +1102,8 @@ snd_pcm_sframes_t pa_alsa_safe_avail(snd_pcm_t *pcm, size_t hwbuf_size, const pa
 
     k = (size_t) n * pa_frame_size(ss);
 
-    if (k >= hwbuf_size * 5 ||
-        k >= pa_bytes_per_second(ss)*10) {
+    if (PA_UNLIKELY(k >= hwbuf_size * 5 ||
+                    k >= pa_bytes_per_second(ss)*10)) {
 
         PA_ONCE_BEGIN {
             char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
@@ -1145,8 +1145,8 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delay, size_t hwbuf_si
 
     abs_k = k >= 0 ? (size_t) k : (size_t) -k;
 
-    if (abs_k >= hwbuf_size * 5 ||
-        abs_k >= pa_bytes_per_second(ss)*10) {
+    if (PA_UNLIKELY(abs_k >= hwbuf_size * 5 ||
+                    abs_k >= pa_bytes_per_second(ss)*10)) {
 
         PA_ONCE_BEGIN {
             char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
@@ -1170,8 +1170,8 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delay, size_t hwbuf_si
     if (capture) {
         abs_k = (size_t) avail * pa_frame_size(ss);
 
-        if (abs_k >= hwbuf_size * 5 ||
-            abs_k >= pa_bytes_per_second(ss)*10) {
+        if (PA_UNLIKELY(abs_k >= hwbuf_size * 5 ||
+                        abs_k >= pa_bytes_per_second(ss)*10)) {
 
             PA_ONCE_BEGIN {
                 char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
@@ -1188,7 +1188,7 @@ int pa_alsa_safe_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delay, size_t hwbuf_si
             avail = (snd_pcm_sframes_t) (hwbuf_size / pa_frame_size(ss));
         }
 
-        if (*delay < avail) {
+        if (PA_UNLIKELY(*delay < avail)) {
             PA_ONCE_BEGIN {
                 char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
                 pa_log(_("snd_pcm_avail_delay() returned strange values: delay %lu is less than avail %lu.\n"
@@ -1229,10 +1229,9 @@ int pa_alsa_safe_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas
 
     k = (size_t) *frames * pa_frame_size(ss);
 
-    if (*frames > before ||
-        k >= hwbuf_size * 3 ||
-        k >= pa_bytes_per_second(ss)*10)
-
+    if (PA_UNLIKELY(*frames > before ||
+                    k >= hwbuf_size * 3 ||
+                    k >= pa_bytes_per_second(ss)*10))
         PA_ONCE_BEGIN {
             char *dn = pa_alsa_get_driver_name_by_pcm(pcm);
             pa_log(_("snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes (%lu ms).\n"

-- 
hooks/post-receive
PulseAudio Sound Server