mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
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>
122 lines
3.2 KiB
C
122 lines
3.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright(c) 2022 Intel Corporation
|
|
*
|
|
* Author: Noah Klayman <noah.klayman@intel.com>
|
|
*/
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM sof
|
|
|
|
#if !defined(_TRACE_SOF_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_SOF_H
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/types.h>
|
|
#include <sound/sof/stream.h>
|
|
#include "../../../sound/soc/sof/sof-audio.h"
|
|
|
|
DECLARE_EVENT_CLASS(sof_widget_template,
|
|
TP_PROTO(struct snd_sof_widget *swidget),
|
|
TP_ARGS(swidget),
|
|
TP_STRUCT__entry(
|
|
__string(name, swidget->widget->name)
|
|
__field(int, use_count)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->use_count = swidget->use_count;
|
|
),
|
|
TP_printk("name=%s use_count=%d", __get_str(name), __entry->use_count)
|
|
);
|
|
|
|
DEFINE_EVENT(sof_widget_template, sof_widget_setup,
|
|
TP_PROTO(struct snd_sof_widget *swidget),
|
|
TP_ARGS(swidget)
|
|
);
|
|
|
|
DEFINE_EVENT(sof_widget_template, sof_widget_free,
|
|
TP_PROTO(struct snd_sof_widget *swidget),
|
|
TP_ARGS(swidget)
|
|
);
|
|
|
|
TRACE_EVENT(sof_ipc3_period_elapsed_position,
|
|
TP_PROTO(struct snd_sof_dev *sdev, struct sof_ipc_stream_posn *posn),
|
|
TP_ARGS(sdev, posn),
|
|
TP_STRUCT__entry(
|
|
__string(device_name, dev_name(sdev->dev))
|
|
__field(u64, host_posn)
|
|
__field(u64, dai_posn)
|
|
__field(u64, wallclock)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(device_name);
|
|
__entry->host_posn = posn->host_posn;
|
|
__entry->dai_posn = posn->dai_posn;
|
|
__entry->wallclock = posn->wallclock;
|
|
),
|
|
TP_printk("device_name=%s host_posn=%#llx dai_posn=%#llx wallclock=%#llx",
|
|
__get_str(device_name), __entry->host_posn, __entry->dai_posn,
|
|
__entry->wallclock)
|
|
);
|
|
|
|
TRACE_EVENT(sof_pcm_pointer_position,
|
|
TP_PROTO(struct snd_sof_dev *sdev,
|
|
struct snd_sof_pcm *spcm,
|
|
struct snd_pcm_substream *substream,
|
|
snd_pcm_uframes_t dma_posn,
|
|
snd_pcm_uframes_t dai_posn
|
|
),
|
|
TP_ARGS(sdev, spcm, substream, dma_posn, dai_posn),
|
|
TP_STRUCT__entry(
|
|
__string(device_name, dev_name(sdev->dev))
|
|
__field(u32, pcm_id)
|
|
__field(int, stream)
|
|
__field(unsigned long, dma_posn)
|
|
__field(unsigned long, dai_posn)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(device_name);
|
|
__entry->pcm_id = le32_to_cpu(spcm->pcm.pcm_id);
|
|
__entry->stream = substream->stream;
|
|
__entry->dma_posn = dma_posn;
|
|
__entry->dai_posn = dai_posn;
|
|
),
|
|
TP_printk("device_name=%s pcm_id=%d stream=%d dma_posn=%lu dai_posn=%lu",
|
|
__get_str(device_name), __entry->pcm_id, __entry->stream,
|
|
__entry->dma_posn, __entry->dai_posn)
|
|
);
|
|
|
|
TRACE_EVENT(sof_stream_position_ipc_rx,
|
|
TP_PROTO(struct device *dev),
|
|
TP_ARGS(dev),
|
|
TP_STRUCT__entry(
|
|
__string(device_name, dev_name(dev))
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(device_name);
|
|
),
|
|
TP_printk("device_name=%s", __get_str(device_name))
|
|
);
|
|
|
|
TRACE_EVENT(sof_ipc4_fw_config,
|
|
TP_PROTO(struct snd_sof_dev *sdev, char *key, u32 value),
|
|
TP_ARGS(sdev, key, value),
|
|
TP_STRUCT__entry(
|
|
__string(device_name, dev_name(sdev->dev))
|
|
__string(key, key)
|
|
__field(u32, value)
|
|
),
|
|
TP_fast_assign(
|
|
__assign_str(device_name);
|
|
__assign_str(key);
|
|
__entry->value = value;
|
|
),
|
|
TP_printk("device_name=%s key=%s value=%d",
|
|
__get_str(device_name), __get_str(key), __entry->value)
|
|
);
|
|
|
|
#endif /* _TRACE_SOF_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|