mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 08:14:15 +08: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>
280 lines
5.4 KiB
C
280 lines
5.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM asoc
|
|
|
|
#if !defined(_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_ASOC_H
|
|
|
|
#include <linux/ktime.h>
|
|
#include <linux/tracepoint.h>
|
|
#include <sound/jack.h>
|
|
|
|
#define DAPM_DIRECT "(direct)"
|
|
#define DAPM_ARROW(dir) (((dir) == SND_SOC_DAPM_DIR_OUT) ? "->" : "<-")
|
|
|
|
TRACE_DEFINE_ENUM(SND_SOC_DAPM_DIR_OUT);
|
|
|
|
struct snd_soc_jack;
|
|
struct snd_soc_card;
|
|
struct snd_soc_dapm_widget;
|
|
struct snd_soc_dapm_path;
|
|
|
|
DECLARE_EVENT_CLASS(snd_soc_dapm,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
|
|
|
|
TP_ARGS(dapm, val),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( card_name, dapm->card->name)
|
|
__string( comp_name, dapm->component ? dapm->component->name : "(none)")
|
|
__field( int, val)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(card_name);
|
|
__assign_str(comp_name);
|
|
__entry->val = val;
|
|
),
|
|
|
|
TP_printk("card=%s component=%s val=%d",
|
|
__get_str(card_name), __get_str(comp_name), (int)__entry->val)
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm, snd_soc_bias_level_start,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
|
|
|
|
TP_ARGS(dapm, val)
|
|
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm, snd_soc_bias_level_done,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_context *dapm, int val),
|
|
|
|
TP_ARGS(dapm, val)
|
|
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(snd_soc_dapm_basic,
|
|
|
|
TP_PROTO(struct snd_soc_card *card, int event),
|
|
|
|
TP_ARGS(card, event),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, card->name )
|
|
__field( int, event )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->event = event;
|
|
),
|
|
|
|
TP_printk("card=%s event=%d", __get_str(name), (int)__entry->event)
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start,
|
|
|
|
TP_PROTO(struct snd_soc_card *card, int event),
|
|
|
|
TP_ARGS(card, event)
|
|
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done,
|
|
|
|
TP_PROTO(struct snd_soc_card *card, int event),
|
|
|
|
TP_ARGS(card, event)
|
|
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(snd_soc_dapm_widget,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_widget *w, int val),
|
|
|
|
TP_ARGS(w, val),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, w->name )
|
|
__field( int, val )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->val = val;
|
|
),
|
|
|
|
TP_printk("widget=%s val=%d", __get_str(name),
|
|
(int)__entry->val)
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_power,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_widget *w, int val),
|
|
|
|
TP_ARGS(w, val)
|
|
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_widget *w, int val),
|
|
|
|
TP_ARGS(w, val)
|
|
|
|
);
|
|
|
|
DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_widget *w, int val),
|
|
|
|
TP_ARGS(w, val)
|
|
|
|
);
|
|
|
|
TRACE_EVENT(snd_soc_dapm_walk_done,
|
|
|
|
TP_PROTO(struct snd_soc_card *card),
|
|
|
|
TP_ARGS(card),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, card->name )
|
|
__field( int, power_checks )
|
|
__field( int, path_checks )
|
|
__field( int, neighbour_checks )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->power_checks = card->dapm_stats.power_checks;
|
|
__entry->path_checks = card->dapm_stats.path_checks;
|
|
__entry->neighbour_checks = card->dapm_stats.neighbour_checks;
|
|
),
|
|
|
|
TP_printk("%s: checks %d power, %d path, %d neighbour",
|
|
__get_str(name), (int)__entry->power_checks,
|
|
(int)__entry->path_checks, (int)__entry->neighbour_checks)
|
|
);
|
|
|
|
TRACE_EVENT(snd_soc_dapm_path,
|
|
|
|
TP_PROTO(struct snd_soc_dapm_widget *widget,
|
|
enum snd_soc_dapm_direction dir,
|
|
struct snd_soc_dapm_path *path),
|
|
|
|
TP_ARGS(widget, dir, path),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( wname, widget->name )
|
|
__string( pname, path->name ? path->name : DAPM_DIRECT)
|
|
__string( pnname, path->node[dir]->name )
|
|
__field( int, path_node )
|
|
__field( int, path_connect )
|
|
__field( int, path_dir )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(wname);
|
|
__assign_str(pname);
|
|
__assign_str(pnname);
|
|
__entry->path_connect = path->connect;
|
|
__entry->path_node = (long)path->node[dir];
|
|
__entry->path_dir = dir;
|
|
),
|
|
|
|
TP_printk("%c%s %s %s %s %s",
|
|
(int) __entry->path_node &&
|
|
(int) __entry->path_connect ? '*' : ' ',
|
|
__get_str(wname), DAPM_ARROW(__entry->path_dir),
|
|
__get_str(pname), DAPM_ARROW(__entry->path_dir),
|
|
__get_str(pnname))
|
|
);
|
|
|
|
TRACE_EVENT(snd_soc_dapm_connected,
|
|
|
|
TP_PROTO(int paths, int stream),
|
|
|
|
TP_ARGS(paths, stream),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( int, paths )
|
|
__field( int, stream )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->paths = paths;
|
|
__entry->stream = stream;
|
|
),
|
|
|
|
TP_printk("%s: found %d paths",
|
|
__entry->stream ? "capture" : "playback", __entry->paths)
|
|
);
|
|
|
|
TRACE_EVENT(snd_soc_jack_irq,
|
|
|
|
TP_PROTO(const char *name),
|
|
|
|
TP_ARGS(name),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, name )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
),
|
|
|
|
TP_printk("%s", __get_str(name))
|
|
);
|
|
|
|
TRACE_EVENT(snd_soc_jack_report,
|
|
|
|
TP_PROTO(struct snd_soc_jack *jack, int mask, int val),
|
|
|
|
TP_ARGS(jack, mask, val),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, jack->jack->id )
|
|
__field( int, mask )
|
|
__field( int, val )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->mask = mask;
|
|
__entry->val = val;
|
|
),
|
|
|
|
TP_printk("jack=%s %x/%x", __get_str(name), (int)__entry->val,
|
|
(int)__entry->mask)
|
|
);
|
|
|
|
TRACE_EVENT(snd_soc_jack_notify,
|
|
|
|
TP_PROTO(struct snd_soc_jack *jack, int val),
|
|
|
|
TP_ARGS(jack, val),
|
|
|
|
TP_STRUCT__entry(
|
|
__string( name, jack->jack->id )
|
|
__field( int, val )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(name);
|
|
__entry->val = val;
|
|
),
|
|
|
|
TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
|
|
);
|
|
|
|
#endif /* _TRACE_ASOC_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|