projects / lttng-modules.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix: asoc: Consolidate path trace events
[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 acbb1a12ea39f61346100a7d41a83ef81c3d7a80..2e78bc3f6ec6160a052bd2b30deae624f4dbe4ac 100644 (file)
--- a/instrumentation/events/lttng-module/asoc.h
+++ b/instrumentation/events/lttng-module/asoc.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_ASOC_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/ktime.h>
 #include <linux/version.h>
 
@@ -14,14 +14,19 @@
 #define _TRACE_ASOC_DEF
 struct snd_soc_jack;
 struct snd_soc_codec;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \
+       LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 struct snd_soc_platform;
 #endif
 struct snd_soc_card;
 struct snd_soc_dapm_widget;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+struct snd_soc_dapm_path;
+#endif
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) \
+       || LTTNG_RHEL_KERNEL_RANGE(3,10,0,514,0,0, 3,11,0,0,0,0))
 #define CODEC_NAME_FIELD component.name
 #define CODEC_ID_FIELD component.id
 #else
@@ -29,10 +34,11 @@ struct snd_soc_dapm_widget;
 #define CODEC_ID_FIELD id
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 /*
  * Log register events
  */
-LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_reg,
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_reg,
 
        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
                 unsigned int val),
@@ -47,7 +53,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_reg,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_write,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_reg, snd_soc_reg_write,
+
+       asoc_snd_soc_reg_write,
 
        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
                 unsigned int val),
@@ -56,7 +64,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_write,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_read,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_reg, snd_soc_reg_read,
+
+       asoc_snd_soc_reg_read,
 
        TP_PROTO(struct snd_soc_codec *codec, unsigned int reg,
                 unsigned int val),
@@ -64,9 +74,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_read,
        TP_ARGS(codec, reg, val)
 
 )
+#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
-LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_preg,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) && \
+       LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_preg,
 
        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
                 unsigned int val),
@@ -81,7 +93,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_preg,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_write,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_preg, snd_soc_preg_write,
+
+       asoc_snd_soc_preg_write,
 
        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
                 unsigned int val),
@@ -90,7 +104,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_write,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_read,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_preg, snd_soc_preg_read,
+
+       asoc_snd_soc_preg_read,
 
        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
                 unsigned int val),
@@ -100,7 +116,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_read,
 )
 #endif
 
-LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_card,
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_card,
 
        TP_PROTO(struct snd_soc_card *card, int val),
 
@@ -112,7 +128,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_card,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_start,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_start,
+
+       asoc_snd_soc_bias_level_start,
 
        TP_PROTO(struct snd_soc_card *card, int val),
 
@@ -120,7 +138,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_start,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_done,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done,
+
+       asoc_snd_soc_bias_level_done,
 
        TP_PROTO(struct snd_soc_card *card, int val),
 
@@ -128,7 +148,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_done,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_basic,
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic,
 
        TP_PROTO(struct snd_soc_card *card),
 
@@ -139,7 +159,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_basic,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_start,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_start,
+
+       asoc_snd_soc_dapm_start,
 
        TP_PROTO(struct snd_soc_card *card),
 
@@ -147,7 +169,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_start,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_done,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done,
+
+       asoc_snd_soc_dapm_done,
 
        TP_PROTO(struct snd_soc_card *card),
 
@@ -155,7 +179,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_done,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_widget,
+LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_widget,
 
        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
 
@@ -167,7 +191,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_widget,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_power,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_widget, snd_soc_dapm_widget_power,
+
+       asoc_snd_soc_dapm_widget_power,
 
        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
 
@@ -175,7 +201,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_power,
 
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_widget, snd_soc_dapm_widget_event_start,
+
+       asoc_snd_soc_dapm_widget_event_start,
 
        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
 
@@ -183,7 +211,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_event_s
 
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_widget, snd_soc_dapm_widget_event_done,
+
+       asoc_snd_soc_dapm_widget_event_done,
 
        TP_PROTO(struct snd_soc_dapm_widget *w, int val),
 
@@ -192,7 +222,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_event_d
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_walk_done,
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_walk_done,
+
+       asoc_snd_soc_dapm_walk_done,
 
        TP_PROTO(struct snd_soc_card *card),
 
@@ -207,8 +239,30 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_walk_done,
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_output_path,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0))
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_path,
+
+       asoc_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_FIELDS(
+               ctf_string(wname, widget->name)
+               ctf_string(pname, path->name ? path->name : DAPM_DIRECT)
+               ctf_string(pnname, path->node[dir]->name)
+               ctf_integer(int, path_node, (long) path->node[dir])
+               ctf_integer(int, path_connect, path->connect)
+               ctf_integer(int, path_dir, dir)
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_output_path,
+
+       asoc_snd_soc_dapm_output_path,
 
        TP_PROTO(struct snd_soc_dapm_widget *widget,
                struct snd_soc_dapm_path *path),
@@ -224,7 +278,9 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_output_path,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_input_path,
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_input_path,
+
+       asoc_snd_soc_dapm_input_path,
 
        TP_PROTO(struct snd_soc_dapm_widget *widget,
                struct snd_soc_dapm_path *path),
@@ -239,8 +295,12 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_input_path,
                ctf_integer(int, path_connect, path->connect)
        )
 )
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_dapm_connected,
 
-LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_connected,
+       asoc_snd_soc_dapm_connected,
 
        TP_PROTO(int paths, int stream),
 
@@ -253,7 +313,9 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_connected,
 )
 #endif
 
-LTTNG_TRACEPOINT_EVENT(snd_soc_jack_irq,
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_irq,
+
+       asoc_snd_soc_jack_irq,
 
        TP_PROTO(const char *name),
 
@@ -264,7 +326,9 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_jack_irq,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT(snd_soc_jack_report,
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_report,
+
+       asoc_snd_soc_jack_report,
 
        TP_PROTO(struct snd_soc_jack *jack, int mask, int val),
 
@@ -277,7 +341,9 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_jack_report,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT(snd_soc_jack_notify,
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_jack_notify,
+
+       asoc_snd_soc_jack_notify,
 
        TP_PROTO(struct snd_soc_jack *jack, int val),
 
@@ -289,7 +355,9 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_jack_notify,
        )
 )
 
-LTTNG_TRACEPOINT_EVENT(snd_soc_cache_sync,
+LTTNG_TRACEPOINT_EVENT_MAP(snd_soc_cache_sync,
+
+       asoc_snd_soc_cache_sync,
 
        TP_PROTO(struct snd_soc_codec *codec, const char *type,
                 const char *status),
@@ -307,4 +375,4 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_cache_sync,
 #endif /* LTTNG_TRACE_ASOC_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
LTTng 2.0/0.x modules
This page took 0.025744 seconds and 4 git commands to generate.