X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fasoc.h;h=4aca115cb960e1532c2b1dcd635847b78346f985;hb=f3f909f4c73fa115c5bab66b2ba2caa7ad2d8bf2;hp=672bea414478d66bc9f06a19c12fb6d166010188;hpb=7c68b363332170e4db100327ecc9e09b8a79cf29;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/asoc.h b/instrumentation/events/lttng-module/asoc.h index 672bea41..4aca115c 100644 --- a/instrumentation/events/lttng-module/asoc.h +++ b/instrumentation/events/lttng-module/asoc.h @@ -1,11 +1,11 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM asoc -#if !defined(_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_ASOC_H +#if !defined(LTTNG_TRACE_ASOC_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_ASOC_H +#include "../../../probes/lttng-tracepoint-event.h" #include -#include #include #define DAPM_DIRECT "(direct)" @@ -21,10 +21,18 @@ struct snd_soc_card; struct snd_soc_dapm_widget; #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) +#define CODEC_NAME_FIELD component.name +#define CODEC_ID_FIELD component.id +#else +#define CODEC_NAME_FIELD name +#define CODEC_ID_FIELD id +#endif + /* * Log register events */ -DECLARE_EVENT_CLASS(snd_soc_reg, +LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_reg, TP_PROTO(struct snd_soc_codec *codec, unsigned int reg, unsigned int val), @@ -32,15 +40,15 @@ DECLARE_EVENT_CLASS(snd_soc_reg, TP_ARGS(codec, reg, val), TP_STRUCT__entry( - __string( name, codec->name ) + __string( name, codec->CODEC_NAME_FIELD ) __field( int, id ) __field( unsigned int, reg ) __field( unsigned int, val ) ), TP_fast_assign( - tp_strcpy(name, codec->name) - tp_assign(id, codec->id) + tp_strcpy(name, codec->CODEC_NAME_FIELD) + tp_assign(id, codec->CODEC_ID_FIELD) tp_assign(reg, reg) tp_assign(val, val) ), @@ -50,7 +58,7 @@ DECLARE_EVENT_CLASS(snd_soc_reg, (unsigned int)__entry->val) ) -DEFINE_EVENT(snd_soc_reg, snd_soc_reg_write, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_write, TP_PROTO(struct snd_soc_codec *codec, unsigned int reg, unsigned int val), @@ -59,7 +67,7 @@ DEFINE_EVENT(snd_soc_reg, snd_soc_reg_write, ) -DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_read, TP_PROTO(struct snd_soc_codec *codec, unsigned int reg, unsigned int val), @@ -69,7 +77,7 @@ DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) -DECLARE_EVENT_CLASS(snd_soc_preg, +LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_preg, TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, unsigned int val), @@ -77,15 +85,15 @@ DECLARE_EVENT_CLASS(snd_soc_preg, TP_ARGS(platform, reg, val), TP_STRUCT__entry( - __string( name, platform->name ) + __string( name, platform->CODEC_NAME_FIELD ) __field( int, id ) __field( unsigned int, reg ) __field( unsigned int, val ) ), TP_fast_assign( - tp_strcpy(name, platform->name) - tp_assign(id, platform->id) + tp_strcpy(name, platform->CODEC_NAME_FIELD) + tp_assign(id, platform->CODEC_ID_FIELD) tp_assign(reg, reg) tp_assign(val, val) ), @@ -95,7 +103,7 @@ DECLARE_EVENT_CLASS(snd_soc_preg, (unsigned int)__entry->val) ) -DEFINE_EVENT(snd_soc_preg, snd_soc_preg_write, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_write, TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, unsigned int val), @@ -104,7 +112,7 @@ DEFINE_EVENT(snd_soc_preg, snd_soc_preg_write, ) -DEFINE_EVENT(snd_soc_preg, snd_soc_preg_read, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_read, TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, unsigned int val), @@ -114,7 +122,7 @@ DEFINE_EVENT(snd_soc_preg, snd_soc_preg_read, ) #endif -DECLARE_EVENT_CLASS(snd_soc_card, +LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_card, TP_PROTO(struct snd_soc_card *card, int val), @@ -133,7 +141,7 @@ DECLARE_EVENT_CLASS(snd_soc_card, TP_printk("card=%s val=%d", __get_str(name), (int)__entry->val) ) -DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_start, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_start, TP_PROTO(struct snd_soc_card *card, int val), @@ -141,7 +149,7 @@ DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_start, ) -DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_done, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_done, TP_PROTO(struct snd_soc_card *card, int val), @@ -149,7 +157,7 @@ DEFINE_EVENT(snd_soc_card, snd_soc_bias_level_done, ) -DECLARE_EVENT_CLASS(snd_soc_dapm_basic, +LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_basic, TP_PROTO(struct snd_soc_card *card), @@ -166,7 +174,7 @@ DECLARE_EVENT_CLASS(snd_soc_dapm_basic, TP_printk("card=%s", __get_str(name)) ) -DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_start, TP_PROTO(struct snd_soc_card *card), @@ -174,7 +182,7 @@ DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start, ) -DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_done, TP_PROTO(struct snd_soc_card *card), @@ -182,7 +190,7 @@ DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done, ) -DECLARE_EVENT_CLASS(snd_soc_dapm_widget, +LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_widget, TP_PROTO(struct snd_soc_dapm_widget *w, int val), @@ -202,7 +210,7 @@ DECLARE_EVENT_CLASS(snd_soc_dapm_widget, (int)__entry->val) ) -DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_power, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_power, TP_PROTO(struct snd_soc_dapm_widget *w, int val), @@ -210,7 +218,7 @@ DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_power, ) -DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start, TP_PROTO(struct snd_soc_dapm_widget *w, int val), @@ -218,7 +226,7 @@ DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_start, ) -DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done, +LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done, TP_PROTO(struct snd_soc_dapm_widget *w, int val), @@ -227,7 +235,7 @@ DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done, ) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) -TRACE_EVENT(snd_soc_dapm_walk_done, +LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_walk_done, TP_PROTO(struct snd_soc_card *card), @@ -254,7 +262,7 @@ TRACE_EVENT(snd_soc_dapm_walk_done, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) -TRACE_EVENT(snd_soc_dapm_output_path, +LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_output_path, TP_PROTO(struct snd_soc_dapm_widget *widget, struct snd_soc_dapm_path *path), @@ -283,7 +291,7 @@ TRACE_EVENT(snd_soc_dapm_output_path, __get_str(wname), __get_str(pname), __get_str(psname)) ) -TRACE_EVENT(snd_soc_dapm_input_path, +LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_input_path, TP_PROTO(struct snd_soc_dapm_widget *widget, struct snd_soc_dapm_path *path), @@ -312,7 +320,7 @@ TRACE_EVENT(snd_soc_dapm_input_path, __get_str(wname), __get_str(pname), __get_str(psname)) ) -TRACE_EVENT(snd_soc_dapm_connected, +LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_connected, TP_PROTO(int paths, int stream), @@ -333,7 +341,7 @@ TRACE_EVENT(snd_soc_dapm_connected, ) #endif -TRACE_EVENT(snd_soc_jack_irq, +LTTNG_TRACEPOINT_EVENT(snd_soc_jack_irq, TP_PROTO(const char *name), @@ -350,7 +358,7 @@ TRACE_EVENT(snd_soc_jack_irq, TP_printk("%s", __get_str(name)) ) -TRACE_EVENT(snd_soc_jack_report, +LTTNG_TRACEPOINT_EVENT(snd_soc_jack_report, TP_PROTO(struct snd_soc_jack *jack, int mask, int val), @@ -372,7 +380,7 @@ TRACE_EVENT(snd_soc_jack_report, (int)__entry->mask) ) -TRACE_EVENT(snd_soc_jack_notify, +LTTNG_TRACEPOINT_EVENT(snd_soc_jack_notify, TP_PROTO(struct snd_soc_jack *jack, int val), @@ -391,7 +399,7 @@ TRACE_EVENT(snd_soc_jack_notify, TP_printk("jack=%s %x", __get_str(name), (int)__entry->val) ) -TRACE_EVENT(snd_soc_cache_sync, +LTTNG_TRACEPOINT_EVENT(snd_soc_cache_sync, TP_PROTO(struct snd_soc_codec *codec, const char *type, const char *status), @@ -399,24 +407,24 @@ TRACE_EVENT(snd_soc_cache_sync, TP_ARGS(codec, type, status), TP_STRUCT__entry( - __string( name, codec->name ) + __string( name, codec->CODEC_NAME_FIELD ) __string( status, status ) __string( type, type ) __field( int, id ) ), TP_fast_assign( - tp_strcpy(name, codec->name) + tp_strcpy(name, codec->CODEC_NAME_FIELD) tp_strcpy(status, status) tp_strcpy(type, type) - tp_assign(id, codec->id) + tp_assign(id, codec->CODEC_ID_FIELD) ), TP_printk("codec=%s.%d type=%s status=%s", __get_str(name), (int)__entry->id, __get_str(type), __get_str(status)) ) -#endif /* _TRACE_ASOC_H */ +#endif /* LTTNG_TRACE_ASOC_H */ /* This part must be outside protection */ #include "../../../probes/define_trace.h"