2c92ca849f
With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.
This means that with:
__string(field, mystring)
Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.
There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:
git grep -l __assign_str | while read a ; do
sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
mv /tmp/test-file $a;
done
I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.
Note, the same updates will need to be done for:
__assign_str_len()
__assign_rel_str()
__assign_rel_str_len()
I tested this with both an allmodconfig and an allyesconfig (build only for both).
[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
150 lines
5.0 KiB
C
150 lines
5.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM snd_pcm
|
|
#define TRACE_INCLUDE_FILE pcm_trace
|
|
|
|
#if !defined(_PCM_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _PCM_TRACE_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
|
|
TRACE_EVENT(hwptr,
|
|
TP_PROTO(struct snd_pcm_substream *substream, snd_pcm_uframes_t pos, bool irq),
|
|
TP_ARGS(substream, pos, irq),
|
|
TP_STRUCT__entry(
|
|
__field( bool, in_interrupt )
|
|
__field( unsigned int, card )
|
|
__field( unsigned int, device )
|
|
__field( unsigned int, number )
|
|
__field( unsigned int, stream )
|
|
__field( snd_pcm_uframes_t, pos )
|
|
__field( snd_pcm_uframes_t, period_size )
|
|
__field( snd_pcm_uframes_t, buffer_size )
|
|
__field( snd_pcm_uframes_t, old_hw_ptr )
|
|
__field( snd_pcm_uframes_t, hw_ptr_base )
|
|
),
|
|
TP_fast_assign(
|
|
__entry->in_interrupt = (irq);
|
|
__entry->card = (substream)->pcm->card->number;
|
|
__entry->device = (substream)->pcm->device;
|
|
__entry->number = (substream)->number;
|
|
__entry->stream = (substream)->stream;
|
|
__entry->pos = (pos);
|
|
__entry->period_size = (substream)->runtime->period_size;
|
|
__entry->buffer_size = (substream)->runtime->buffer_size;
|
|
__entry->old_hw_ptr = (substream)->runtime->status->hw_ptr;
|
|
__entry->hw_ptr_base = (substream)->runtime->hw_ptr_base;
|
|
),
|
|
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->number,
|
|
__entry->in_interrupt ? "IRQ" : "POS",
|
|
(unsigned long)__entry->pos,
|
|
(unsigned long)__entry->old_hw_ptr,
|
|
(unsigned long)__entry->hw_ptr_base,
|
|
(unsigned long)__entry->period_size,
|
|
(unsigned long)__entry->buffer_size)
|
|
);
|
|
|
|
TRACE_EVENT(xrun,
|
|
TP_PROTO(struct snd_pcm_substream *substream),
|
|
TP_ARGS(substream),
|
|
TP_STRUCT__entry(
|
|
__field( unsigned int, card )
|
|
__field( unsigned int, device )
|
|
__field( unsigned int, number )
|
|
__field( unsigned int, stream )
|
|
__field( snd_pcm_uframes_t, period_size )
|
|
__field( snd_pcm_uframes_t, buffer_size )
|
|
__field( snd_pcm_uframes_t, old_hw_ptr )
|
|
__field( snd_pcm_uframes_t, hw_ptr_base )
|
|
),
|
|
TP_fast_assign(
|
|
__entry->card = (substream)->pcm->card->number;
|
|
__entry->device = (substream)->pcm->device;
|
|
__entry->number = (substream)->number;
|
|
__entry->stream = (substream)->stream;
|
|
__entry->period_size = (substream)->runtime->period_size;
|
|
__entry->buffer_size = (substream)->runtime->buffer_size;
|
|
__entry->old_hw_ptr = (substream)->runtime->status->hw_ptr;
|
|
__entry->hw_ptr_base = (substream)->runtime->hw_ptr_base;
|
|
),
|
|
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->number,
|
|
(unsigned long)__entry->old_hw_ptr,
|
|
(unsigned long)__entry->hw_ptr_base,
|
|
(unsigned long)__entry->period_size,
|
|
(unsigned long)__entry->buffer_size)
|
|
);
|
|
|
|
TRACE_EVENT(hw_ptr_error,
|
|
TP_PROTO(struct snd_pcm_substream *substream, const char *why),
|
|
TP_ARGS(substream, why),
|
|
TP_STRUCT__entry(
|
|
__field( unsigned int, card )
|
|
__field( unsigned int, device )
|
|
__field( unsigned int, number )
|
|
__field( unsigned int, stream )
|
|
__string( reason, why )
|
|
),
|
|
TP_fast_assign(
|
|
__entry->card = (substream)->pcm->card->number;
|
|
__entry->device = (substream)->pcm->device;
|
|
__entry->number = (substream)->number;
|
|
__entry->stream = (substream)->stream;
|
|
__assign_str(reason);
|
|
),
|
|
TP_printk("pcmC%dD%d%s/sub%d: ERROR: %s",
|
|
__entry->card, __entry->device,
|
|
__entry->stream == SNDRV_PCM_STREAM_PLAYBACK ? "p" : "c",
|
|
__entry->number, __get_str(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 */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH .
|
|
#include <trace/define_trace.h>
|