Migrate tracepoint instrumentation to TP_FIELDS

[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 4aca115cb960e1532c2b1dcd635847b78346f985..acbb1a12ea39f61346100a7d41a83ef81c3d7a80 100644 (file)
--- a/instrumentation/events/lttng-module/asoc.h
+++ b/instrumentation/events/lttng-module/asoc.h
@@ -39,23 +39,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_reg,
 
        TP_ARGS(codec, reg, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           codec->CODEC_NAME_FIELD )
-               __field(        int,            id              )
-               __field(        unsigned int,   reg             )
-               __field(        unsigned int,   val             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, codec->CODEC_NAME_FIELD)
-               tp_assign(id, codec->CODEC_ID_FIELD)
-               tp_assign(reg, reg)
-               tp_assign(val, val)
-       ),
-
-       TP_printk("codec=%s.%d reg=%x val=%x", __get_str(name),
-                 (int)__entry->id, (unsigned int)__entry->reg,
-                 (unsigned int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, codec->CODEC_NAME_FIELD)
+               ctf_integer(int, id, codec->CODEC_ID_FIELD)
+               ctf_integer(unsigned int, reg, reg)
+               ctf_integer(unsigned int, val, val)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_reg, snd_soc_reg_write,
@@ -84,23 +73,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_preg,
 
        TP_ARGS(platform, reg, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           platform->CODEC_NAME_FIELD      )
-               __field(        int,            id              )
-               __field(        unsigned int,   reg             )
-               __field(        unsigned int,   val             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, platform->CODEC_NAME_FIELD)
-               tp_assign(id, platform->CODEC_ID_FIELD)
-               tp_assign(reg, reg)
-               tp_assign(val, val)
-       ),
-
-       TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name),
-                 (int)__entry->id, (unsigned int)__entry->reg,
-                 (unsigned int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, platform->CODEC_NAME_FIELD)
+               ctf_integer(int, id, platform->CODEC_ID_FIELD)
+               ctf_integer(unsigned int, reg, reg)
+               ctf_integer(unsigned int, val, val)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_preg, snd_soc_preg_write,
@@ -128,17 +106,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_card,
 
        TP_ARGS(card, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           card->name      )
-               __field(        int,            val             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, card->name)
-               tp_assign(val, val)
-       ),
-
-       TP_printk("card=%s val=%d", __get_str(name), (int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, card->name)
+               ctf_integer(int, val, val)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_card, snd_soc_bias_level_start,
@@ -163,15 +134,9 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_basic,
 
        TP_ARGS(card),
 
-       TP_STRUCT__entry(
-               __string(       name,   card->name      )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, card->name)
-       ),
-
-       TP_printk("card=%s", __get_str(name))
+       TP_FIELDS(
+               ctf_string(name, card->name)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_basic, snd_soc_dapm_start,
@@ -196,18 +161,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(snd_soc_dapm_widget,
 
        TP_ARGS(w, val),
 
-       TP_STRUCT__entry(
-               __string(       name,   w->name         )
-               __field(        int,    val             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, w->name)
-               tp_assign(val, val)
-       ),
-
-       TP_printk("widget=%s val=%d", __get_str(name),
-                 (int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, w->name)
+               ctf_integer(int, val, val)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(snd_soc_dapm_widget, snd_soc_dapm_widget_power,
@@ -241,23 +198,12 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_walk_done,
 
        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(
-               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",
-                 __get_str(name), (int)__entry->power_checks,
-                 (int)__entry->path_checks, (int)__entry->neighbour_checks)
+       TP_FIELDS(
+               ctf_string(name, card->name)
+               ctf_integer(int, power_checks, card->dapm_stats.power_checks)
+               ctf_integer(int, path_checks, card->dapm_stats.path_checks)
+               ctf_integer(int, neighbour_checks, card->dapm_stats.neighbour_checks)
+       )
 )
 #endif
 
@@ -269,26 +215,13 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_output_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))
+       TP_FIELDS(
+               ctf_string(wname, widget->name)
+               ctf_string(pname, path->name ? path->name : DAPM_DIRECT)
+               ctf_string(psname, path->sink->name)
+               ctf_integer(int, path_sink, (long) path->sink)
+               ctf_integer(int, path_connect, path->connect)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_input_path,
@@ -298,26 +231,13 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_input_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))
+       TP_FIELDS(
+               ctf_string(wname, widget->name)
+               ctf_string(pname,path->name ? path->name : DAPM_DIRECT)
+               ctf_string(psname, path->source->name)
+               ctf_integer(int, path_source, (long) path->source)
+               ctf_integer(int, path_connect, path->connect)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_connected,
@@ -326,18 +246,10 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_dapm_connected,
 
        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)
+       TP_FIELDS(
+               ctf_integer(int, paths, paths)
+               ctf_integer(int, stream, stream)
+       )
 )
 #endif
 
@@ -347,15 +259,9 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_jack_irq,
 
        TP_ARGS(name),
 
-       TP_STRUCT__entry(
-               __string(       name,   name            )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, name)
-       ),
-
-       TP_printk("%s", __get_str(name))
+       TP_FIELDS(
+               ctf_string(name, name)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(snd_soc_jack_report,
@@ -364,20 +270,11 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_jack_report,
 
        TP_ARGS(jack, mask, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           jack->jack->name        )
-               __field(        int,            mask                    )
-               __field(        int,            val                     )
-       ),
-
-       TP_fast_assign(
-               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,
-                 (int)__entry->mask)
+       TP_FIELDS(
+               ctf_string(name, jack->jack->name)
+               ctf_integer(int, mask, mask)
+               ctf_integer(int, val, val)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(snd_soc_jack_notify,
@@ -386,17 +283,10 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_jack_notify,
 
        TP_ARGS(jack, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           jack->jack->name        )
-               __field(        int,            val                     )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, jack->jack->name)
-               tp_assign(val, val)
-       ),
-
-       TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, jack->jack->name)
+               ctf_integer(int, val, val)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(snd_soc_cache_sync,
@@ -406,22 +296,12 @@ LTTNG_TRACEPOINT_EVENT(snd_soc_cache_sync,
 
        TP_ARGS(codec, type, status),
 
-       TP_STRUCT__entry(
-               __string(       name,           codec->CODEC_NAME_FIELD )
-               __string(       status,         status          )
-               __string(       type,           type            )
-               __field(        int,            id              )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, codec->CODEC_NAME_FIELD)
-               tp_strcpy(status, status)
-               tp_strcpy(type, type)
-               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))
+       TP_FIELDS(
+               ctf_string(name, codec->CODEC_NAME_FIELD)
+               ctf_string(status, status)
+               ctf_string(type, type)
+               ctf_integer(int, id, codec->CODEC_ID_FIELD)
+       )
 )
 
 #endif /* LTTNG_TRACE_ASOC_H */