Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5abd532 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: pcm: use %s instead of %c for format of PCM buffer tracepoints 



As long as I know, in userspace, '%c' format on printing format for
tracepoint is replaced with '>c<' by existent tracing program; i.g.
'perf-trace' and 'trace-cmd'. This is inconvenient.

This commit replaces the format with '%s'. The length of letters in the
format string is not changed, thus this commit doesn't increase object
size.

In theory, I should work for improvements of these tracing programs, but
here I'd like to save my time to work for the other projects.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fccf5388

sound/core/pcm_trace.h

+6 −6
Original line number Diff line number Diff line
@@ -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,9 +96,9 @@ 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)

);