Migrate tracepoint instrumentation to TP_FIELDS

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

diff --git a/instrumentation/events/lttng-module/regmap.h b/instrumentation/events/lttng-module/regmap.h
index df56ac00dbc323201fc8b0520cac2dd23b4be418..eef3c6cd255dcfeadb0b80ba15d4276febeba9c7 100644 (file)
--- a/instrumentation/events/lttng-module/regmap.h
+++ b/instrumentation/events/lttng-module/regmap.h
@@ -1,11 +1,11 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regmap
 
-#if !defined(_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_REGMAP_H
+#if !defined(LTTNG_TRACE_REGMAP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_REGMAP_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/ktime.h>
-#include <linux/tracepoint.h>
 #include <linux/version.h>
 
 #ifndef _TRACE_REGMAP_DEF_
@@ -17,31 +17,21 @@ struct regmap;
 /*
  * Log register events
  */
-DECLARE_EVENT_CLASS(regmap_reg,
+LTTNG_TRACEPOINT_EVENT_CLASS(regmap_reg,
 
        TP_PROTO(struct device *dev, unsigned int reg,
                 unsigned int val),
 
        TP_ARGS(dev, reg, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           dev_name(dev)   )
-               __field(        unsigned int,   reg             )
-               __field(        unsigned int,   val             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
-               tp_assign(reg, reg)
-               tp_assign(val, val)
-       ),
-
-       TP_printk("%s reg=%x val=%x", __get_str(name),
-                 (unsigned int)__entry->reg,
-                 (unsigned int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, dev_name(dev))
+               ctf_integer(unsigned int, reg, reg)
+               ctf_integer(unsigned int, val, val)
+       )
 )
 
-DEFINE_EVENT(regmap_reg, regmap_reg_write,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_reg, regmap_reg_write,
 
        TP_PROTO(struct device *dev, unsigned int reg,
                 unsigned int val),
@@ -50,7 +40,7 @@ DEFINE_EVENT(regmap_reg, regmap_reg_write,
 
 )
 
-DEFINE_EVENT(regmap_reg, regmap_reg_read,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_reg, regmap_reg_read,
 
        TP_PROTO(struct device *dev, unsigned int reg,
                 unsigned int val),
@@ -60,7 +50,7 @@ DEFINE_EVENT(regmap_reg, regmap_reg_read,
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_reg, regmap_reg_read_cache,
 
        TP_PROTO(struct device *dev, unsigned int reg,
                 unsigned int val),
@@ -70,102 +60,77 @@ DEFINE_EVENT(regmap_reg, regmap_reg_read_cache,
 )
 #endif
 
-DECLARE_EVENT_CLASS(regmap_block,
+LTTNG_TRACEPOINT_EVENT_CLASS(regmap_block,
 
        TP_PROTO(struct device *dev, unsigned int reg, int count),
 
        TP_ARGS(dev, reg, count),
 
-       TP_STRUCT__entry(
-               __string(       name,           dev_name(dev)   )
-               __field(        unsigned int,   reg             )
-               __field(        int,            count           )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
-               tp_assign(reg, reg)
-               tp_assign(count, count)
-       ),
-
-       TP_printk("%s reg=%x count=%d", __get_str(name),
-                 (unsigned int)__entry->reg,
-                 (int)__entry->count)
+       TP_FIELDS(
+               ctf_string(name, dev_name(dev))
+               ctf_integer(unsigned int, reg, reg)
+               ctf_integer(int, count, count)
+       )
 )
 
-DEFINE_EVENT(regmap_block, regmap_hw_read_start,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_block, regmap_hw_read_start,
 
        TP_PROTO(struct device *dev, unsigned int reg, int count),
 
        TP_ARGS(dev, reg, count)
 )
 
-DEFINE_EVENT(regmap_block, regmap_hw_read_done,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_block, regmap_hw_read_done,
 
        TP_PROTO(struct device *dev, unsigned int reg, int count),
 
        TP_ARGS(dev, reg, count)
 )
 
-DEFINE_EVENT(regmap_block, regmap_hw_write_start,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_block, regmap_hw_write_start,
 
        TP_PROTO(struct device *dev, unsigned int reg, int count),
 
        TP_ARGS(dev, reg, count)
 )
 
-DEFINE_EVENT(regmap_block, regmap_hw_write_done,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_block, regmap_hw_write_done,
 
        TP_PROTO(struct device *dev, unsigned int reg, int count),
 
        TP_ARGS(dev, reg, count)
 )
 
-TRACE_EVENT(regcache_sync,
+LTTNG_TRACEPOINT_EVENT_MAP(regcache_sync,
+
+       regmap_regcache_sync,
 
        TP_PROTO(struct device *dev, const char *type,
                 const char *status),
 
        TP_ARGS(dev, type, status),
 
-       TP_STRUCT__entry(
-               __string(       name,           dev_name(dev)   )
-               __string(       status,         status          )
-               __string(       type,           type            )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
-               tp_strcpy(status, status)
-               tp_strcpy(type, type)
-       ),
-
-       TP_printk("%s type=%s status=%s", __get_str(name),
-                 __get_str(type), __get_str(status))
+       TP_FIELDS(
+               ctf_string(name, dev_name(dev))
+               ctf_string(status, status)
+               ctf_string(type, type)
+       )
 )
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-DECLARE_EVENT_CLASS(regmap_bool,
+LTTNG_TRACEPOINT_EVENT_CLASS(regmap_bool,
 
        TP_PROTO(struct device *dev, bool flag),
 
        TP_ARGS(dev, flag),
 
-       TP_STRUCT__entry(
-               __string(       name,           dev_name(dev)   )
-               __field(        int,            flag            )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, dev_name(dev))
-               tp_assign(flag, flag)
-       ),
-
-       TP_printk("%s flag=%d", __get_str(name),
-                 (int)__entry->flag)
+       TP_FIELDS(
+               ctf_string(name, dev_name(dev))
+               ctf_integer(int, flag, flag)
+       )
 )
 
-DEFINE_EVENT(regmap_bool, regmap_cache_only,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_bool, regmap_cache_only,
 
        TP_PROTO(struct device *dev, bool flag),
 
@@ -173,7 +138,7 @@ DEFINE_EVENT(regmap_bool, regmap_cache_only,
 
 )
 
-DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regmap_bool, regmap_cache_bypass,
 
        TP_PROTO(struct device *dev, bool flag),
 
@@ -182,7 +147,7 @@ DEFINE_EVENT(regmap_bool, regmap_cache_bypass,
 )
 #endif
 
-#endif /* _TRACE_REGMAP_H */
+#endif /* LTTNG_TRACE_REGMAP_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"