1 files changed, 44 insertions, 6 deletions

diff --git a/sound/core/pcm_trace.h b/sound/core/pcm_trace.h
index b63b654da5ff..3ddec1b8ae46 100644
--- a/sound/core/pcm_trace.h
+++ b/sound/core/pcm_trace.h
@@ -34,9 +34,9 @@ TRACE_EVENT(hwptr,
                 __entry->old_hw_ptr = (substream)->runtime->status->hw_ptr;
                 __entry->hw_ptr_base = (substream)->runtime->hw_ptr_base;
         ),
-        TP_printk("pcmC%dD%d%c/sub%d: %s: pos=%lu, old=%lu, base=%lu, period=%lu, buf=%lu",
+        TP_printk("pcmC%dD%d%s/sub%d: %s: pos=%lu, old=%lu, base=%lu, period=%lu, buf=%lu",
                   __entry->card, __entry->device,
-                  __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c',
+                  __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",
                   __entry->number,
                   __entry->in_interrupt ? "IRQ" : "POS",
                   (unsigned long)__entry->pos,
@@ -69,9 +69,9 @@ TRACE_EVENT(xrun,
                 __entry->old_hw_ptr = (substream)->runtime->status->hw_ptr;
                 __entry->hw_ptr_base = (substream)->runtime->hw_ptr_base;
         ),
-        TP_printk("pcmC%dD%d%c/sub%d: XRUN: old=%lu, base=%lu, period=%lu, buf=%lu",
+        TP_printk("pcmC%dD%d%s/sub%d: XRUN: old=%lu, base=%lu, period=%lu, buf=%lu",
                   __entry->card, __entry->device,
-                  __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c',
+                  __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",
                   __entry->number,
                   (unsigned long)__entry->old_hw_ptr,
                   (unsigned long)__entry->hw_ptr_base,
@@ -96,12 +96,50 @@ TRACE_EVENT(hw_ptr_error,
                 __entry->stream = (substream)->stream;
                 __entry->reason = (why);
         ),
-        TP_printk("pcmC%dD%d%c/sub%d: ERROR: %s",
+        TP_printk("pcmC%dD%d%s/sub%d: ERROR: %s",
                   __entry->card, __entry->device,
-                  __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c',
+                  __entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",
                   __entry->number, __entry->reason)
 );
 
+TRACE_EVENT(applptr,
+        TP_PROTO(struct snd_pcm_substream *substream, snd_pcm_uframes_t prev, snd_pcm_uframes_t curr),
+        TP_ARGS(substream, prev, curr),
+        TP_STRUCT__entry(
+                __field( unsigned int, card )
+                __field( unsigned int, device )
+                __field( unsigned int, number )
+                __field( unsigned int, stream )
+                __field( snd_pcm_uframes_t, prev )
+                __field( snd_pcm_uframes_t, curr )
+                __field( snd_pcm_uframes_t, avail )
+                __field( snd_pcm_uframes_t, period_size )
+                __field( snd_pcm_uframes_t, buffer_size )
+        ),
+        TP_fast_assign(
+                __entry->card = (substream)->pcm->card->number;
+                __entry->device = (substream)->pcm->device;
+                __entry->number = (substream)->number;
+                __entry->stream = (substream)->stream;
+                __entry->prev = (prev);
+                __entry->curr = (curr);
+                __entry->avail = (substream)->stream ? snd_pcm_capture_avail(substream->runtime) : snd_pcm_playback_avail(substream->runtime);
+                __entry->period_size = (substream)->runtime->period_size;
+                __entry->buffer_size = (substream)->runtime->buffer_size;
+        ),
+        TP_printk("pcmC%dD%d%s/sub%d: prev=%lu, curr=%lu, avail=%lu, period=%lu, buf=%lu",
+                __entry->card,
+                __entry->device,
+                __entry->stream ? "c" : "p",
+                __entry->number,
+                __entry->prev,
+                __entry->curr,
+                __entry->avail,
+                __entry->period_size,
+                __entry->buffer_size
+        )
+);
+
 #endif /* _PCM_TRACE_H */
 
 /* This part must be outside protection */