f5914908a5
ALSA PCM core has a mechanism tracking the PCM hwptr updates for analyzing XRUNs. But its log is limited (up to 10) and its log output is a kernel message, which is hard to handle. In this patch, the hwptr logging is moved to the tracing infrastructure instead of its own. Not only the hwptr updates but also XRUN and hwptr errors are recorded on the trace log, so that user can see such events at the exact timing. The new "snd_pcm" entry will appear in the tracing events: # ls -F /sys/kernel/debug/tracing/events/snd_pcm enable filter hw_ptr_error/ hwptr/ xrun/ The hwptr is for the regular hwptr update events. An event trace looks like: aplay-26187 [004] d..3 4012.834761: hwptr: pcmC0D0p/sub0: POS: pos=488, old=0, base=0, period=1024, buf=16384 "POS" shows the hwptr update by the explicit position update call and "IRQ" means the hwptr update by the interrupt, i.e. snd_pcm_period_elapsed() call. The "pos" is the passed ring-buffer offset by the caller, "old" is the previous hwptr, "base" is the hwptr base position, "period" and "buf" are period- and buffer-size of the target PCM substream. (Note that the hwptr position displayed here isn't the ring-buffer offset. It increments up to the PCM position boundary.) The XRUN event appears similarly, but without "pos" field. The hwptr error events appear with the PCM identifier and its reason string, such as "Lost interrupt?". The XRUN and hwptr error reports on kernel message are still left, can be turned on/off via xrun_debug proc like before. But the bit 3, 4, 5 and 6 bits of xrun_debug proc are dropped by this patch. Also, along with the change, the message strings have been reformatted to be a bit more consistent. Last but not least, the hwptr reporting is enabled only when CONFIG_SND_PCM_XRUN_DEBUG is set. Signed-off-by: Takashi Iwai <tiwai@suse.de>
43 lines
1.2 KiB
Makefile
43 lines
1.2 KiB
Makefile
#
|
|
# Makefile for ALSA
|
|
# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz>
|
|
#
|
|
|
|
snd-y := sound.o init.o memory.o info.o control.o misc.o device.o
|
|
snd-$(CONFIG_ISA_DMA_API) += isadma.o
|
|
snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o
|
|
snd-$(CONFIG_SND_VMASTER) += vmaster.o
|
|
snd-$(CONFIG_SND_KCTL_JACK) += ctljack.o
|
|
snd-$(CONFIG_SND_JACK) += jack.o
|
|
|
|
snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
|
|
pcm_memory.o memalloc.o
|
|
snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o
|
|
|
|
# for trace-points
|
|
CFLAGS_pcm_lib.o := -I$(src)
|
|
|
|
snd-pcm-dmaengine-objs := pcm_dmaengine.o
|
|
|
|
snd-rawmidi-objs := rawmidi.o
|
|
snd-timer-objs := timer.o
|
|
snd-hrtimer-objs := hrtimer.o
|
|
snd-rtctimer-objs := rtctimer.o
|
|
snd-hwdep-objs := hwdep.o
|
|
|
|
snd-compress-objs := compress_offload.o
|
|
|
|
obj-$(CONFIG_SND) += snd.o
|
|
obj-$(CONFIG_SND_HWDEP) += snd-hwdep.o
|
|
obj-$(CONFIG_SND_TIMER) += snd-timer.o
|
|
obj-$(CONFIG_SND_HRTIMER) += snd-hrtimer.o
|
|
obj-$(CONFIG_SND_RTCTIMER) += snd-rtctimer.o
|
|
obj-$(CONFIG_SND_PCM) += snd-pcm.o
|
|
obj-$(CONFIG_SND_DMAENGINE_PCM) += snd-pcm-dmaengine.o
|
|
obj-$(CONFIG_SND_RAWMIDI) += snd-rawmidi.o
|
|
|
|
obj-$(CONFIG_SND_OSSEMUL) += oss/
|
|
obj-$(CONFIG_SND_SEQUENCER) += seq/
|
|
|
|
obj-$(CONFIG_SND_COMPRESS_OFFLOAD) += snd-compress.o
|