Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/core
Modified Files: pcm.c pcm_lib.c Log Message: - suppress the xrun debug output unless xrun_debug proc is set. - show stack trace when xrun_debug > 1. Index: pcm.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- pcm.c 24 Feb 2004 15:37:44 -0000 1.40 +++ pcm.c 19 Mar 2004 20:17:34 -0000 1.41 @@ -403,7 +403,7 @@ snd_pcm_str_t *pstr = (snd_pcm_str_t *)entry->private_data; char line[64]; if (!snd_info_get_line(buffer, line, sizeof(line))) - pstr->xrun_debug = !!simple_strtoul(line, NULL, 10); + pstr->xrun_debug = simple_strtoul(line, NULL, 10); } #endif Index: pcm_lib.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_lib.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- pcm_lib.c 6 Mar 2004 10:02:48 -0000 1.49 +++ pcm_lib.c 19 Mar 2004 20:17:34 -0000 1.50 @@ -167,7 +167,8 @@ substream->pcm->card->number, substream->pcm->device, substream->stream ? 'c' : 'p'); - dump_stack(); + if (substream->pstr->xrun_debug > 1) + dump_stack(); } #endif return -EPIPE; @@ -194,8 +195,11 @@ if (delta > 0) { if ((snd_pcm_uframes_t)delta < runtime->buffer_size / 2) { #ifdef CONFIG_SND_DEBUG - if (runtime->periods > 1) + if (runtime->periods > 1 && substream->pstr->xrun_debug) { snd_printd(KERN_ERR "Unexpected hw_pointer value [1] (stream = %i, delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream, (long) delta, runtime->buffer_size / 2); + if (substream->pstr->xrun_debug > 1) + dump_stack(); + } #endif return 0; } @@ -232,8 +236,11 @@ if (delta > 0) { if ((snd_pcm_uframes_t)delta < runtime->buffer_size / 2) { #ifdef CONFIG_SND_DEBUG - if (runtime->periods > 2) + if (runtime->periods > 2 && substream->pstr->xrun_debug) { snd_printd(KERN_ERR "Unexpected hw_pointer value [2] (stream = %i, delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n", substream->stream, (long) delta, runtime->buffer_size / 2); + if (substream->pstr->xrun_debug > 1) + dump_stack(); + } #endif return 0; } ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog