Update kernel probes to more detailed match to kernel versions

[lttng-modules.git] / instrumentation / events / lttng-module / asoc.h

diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h
index cb9e701b2aea5b03d8442a33582233ed7a78d146..672bea414478d66bc9f06a19c12fb6d166010188 100644 (file)
--- a/instrumentation/events/lttng-module/asoc.h
+++ b/instrumentation/events/lttng-module/asoc.h
@@ -8,6 +8,8 @@
 #include <linux/tracepoint.h>
 #include <linux/version.h>
 
+#define DAPM_DIRECT "(direct)"
+
 #ifndef _TRACE_ASOC_DEF
 #define _TRACE_ASOC_DEF
 struct snd_soc_jack;
@@ -37,10 +39,10 @@ DECLARE_EVENT_CLASS(snd_soc_reg,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, codec->name);
-               tp_assign(id, codec->id);
-               tp_assign(reg, reg);
-               tp_assign(val, val);
+               tp_strcpy(name, codec->name)
+               tp_assign(id, codec->id)
+               tp_assign(reg, reg)
+               tp_assign(val, val)
        ),
 
        TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
@@ -82,10 +84,10 @@ DECLARE_EVENT_CLASS(snd_soc_preg,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, platform->name);
-               tp_assign(id, platform->id);
-               tp_assign(reg, reg);
-               tp_assign(val, val);
+               tp_strcpy(name, platform->name)
+               tp_assign(id, platform->id)
+               tp_assign(reg, reg)
+               tp_assign(val, val)
        ),
 
        TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name),
@@ -124,8 +126,8 @@ DECLARE_EVENT_CLASS(snd_soc_card,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, card->name);
-               tp_assign(val, val);
+               tp_strcpy(name, card->name)
+               tp_assign(val, val)
        ),
 
        TP_printk("card=%s val=%d", __get_str(name), (int)__entry->val)
@@ -158,7 +160,7 @@ DECLARE_EVENT_CLASS(snd_soc_dapm_basic,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, card->name);
+               tp_strcpy(name, card->name)
        ),
 
        TP_printk("card=%s", __get_str(name))
@@ -192,8 +194,8 @@ DECLARE_EVENT_CLASS(snd_soc_dapm_widget,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, w->name);
-               tp_assign(val, val);
+               tp_strcpy(name, w->name)
+               tp_assign(val, val)
        ),
 
        TP_printk("widget=%s val=%d", __get_str(name),
@@ -239,10 +241,10 @@ TRACE_EVENT(snd_soc_dapm_walk_done,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, card->name);
-               tp_assign(power_checks, card->dapm_stats.power_checks);
-               tp_assign(path_checks, card->dapm_stats.path_checks);
-               tp_assign(neighbour_checks, card->dapm_stats.neighbour_checks);
+               tp_strcpy(name, card->name)
+               tp_assign(power_checks, card->dapm_stats.power_checks)
+               tp_assign(path_checks, card->dapm_stats.path_checks)
+               tp_assign(neighbour_checks, card->dapm_stats.neighbour_checks)
        ),
 
        TP_printk("%s: checks %d power, %d path, %d neighbour",
@@ -251,6 +253,86 @@ TRACE_EVENT(snd_soc_dapm_walk_done,
 )
 #endif
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+TRACE_EVENT(snd_soc_dapm_output_path,
+
+       TP_PROTO(struct snd_soc_dapm_widget *widget,
+               struct snd_soc_dapm_path *path),
+
+       TP_ARGS(widget, path),
+
+       TP_STRUCT__entry(
+               __string(       wname,  widget->name            )
+               __string(       pname,  path->name ? path->name : DAPM_DIRECT)
+               __string(       psname, path->sink->name        )
+               __field(        int,    path_sink               )
+               __field(        int,    path_connect            )
+       ),
+
+       TP_fast_assign(
+               tp_strcpy(wname, widget->name)
+               tp_strcpy(pname, path->name ? path->name : DAPM_DIRECT)
+               tp_strcpy(psname, path->sink->name)
+               tp_assign(path_connect, path->connect)
+               tp_assign(path_sink, (long)path->sink)
+       ),
+
+       TP_printk("%c%s -> %s -> %s\n",
+               (int) __entry->path_sink &&
+               (int) __entry->path_connect ? '*' : ' ',
+               __get_str(wname), __get_str(pname), __get_str(psname))
+)
+
+TRACE_EVENT(snd_soc_dapm_input_path,
+
+       TP_PROTO(struct snd_soc_dapm_widget *widget,
+               struct snd_soc_dapm_path *path),
+
+       TP_ARGS(widget, path),
+
+       TP_STRUCT__entry(
+               __string(       wname,  widget->name            )
+               __string(       pname,  path->name ? path->name : DAPM_DIRECT)
+               __string(       psname, path->source->name      )
+               __field(        int,    path_source             )
+               __field(        int,    path_connect            )
+       ),
+
+       TP_fast_assign(
+               tp_strcpy(wname, widget->name)
+               tp_strcpy(pname, path->name ? path->name : DAPM_DIRECT)
+               tp_strcpy(psname, path->source->name)
+               tp_assign(path_connect, path->connect)
+               tp_assign(path_source, (long)path->source)
+       ),
+
+       TP_printk("%c%s <- %s <- %s\n",
+               (int) __entry->path_source &&
+               (int) __entry->path_connect ? '*' : ' ',
+               __get_str(wname), __get_str(pname), __get_str(psname))
+)
+
+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(
+               tp_assign(paths, paths)
+               tp_assign(stream, stream)
+       ),
+
+       TP_printk("%s: found %d paths\n",
+               __entry->stream ? "capture" : "playback", __entry->paths)
+)
+#endif
+
 TRACE_EVENT(snd_soc_jack_irq,
 
        TP_PROTO(const char *name),
@@ -262,7 +344,7 @@ TRACE_EVENT(snd_soc_jack_irq,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, name);
+               tp_strcpy(name, name)
        ),
 
        TP_printk("%s", __get_str(name))
@@ -281,9 +363,9 @@ TRACE_EVENT(snd_soc_jack_report,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, jack->jack->name);
-               tp_assign(mask, mask);
-               tp_assign(val, val);
+               tp_strcpy(name, jack->jack->name)
+               tp_assign(mask, mask)
+               tp_assign(val, val)
        ),
 
        TP_printk("jack=%s %x/%x", __get_str(name), (int)__entry->val,
@@ -302,8 +384,8 @@ TRACE_EVENT(snd_soc_jack_notify,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, jack->jack->name);
-               tp_assign(val, val);
+               tp_strcpy(name, jack->jack->name)
+               tp_assign(val, val)
        ),
 
        TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
@@ -324,10 +406,10 @@ TRACE_EVENT(snd_soc_cache_sync,
        ),
 
        TP_fast_assign(
-               tp_strcpy(name, codec->name);
-               tp_strcpy(status, status);
-               tp_strcpy(type, type);
-               tp_assign(id, codec->id);
+               tp_strcpy(name, codec->name)
+               tp_strcpy(status, status)
+               tp_strcpy(type, type)
+               tp_assign(id, codec->id)
        ),
 
        TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),