Migrate tracepoint instrumentation to TP_FIELDS

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

diff --git a/instrumentation/events/lttng-module/regulator.h b/instrumentation/events/lttng-module/regulator.h
index e94da7cd7f9374e9cd6ac4bb1ef72591b2b19dad..b2edf5ae9d3512112f9b9de43d2a53009fa7703e 100644 (file)
--- a/instrumentation/events/lttng-module/regulator.h
+++ b/instrumentation/events/lttng-module/regulator.h
@@ -1,35 +1,28 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regulator
 
-#if !defined(_TRACE_REGULATOR_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_REGULATOR_H
+#if !defined(LTTNG_TRACE_REGULATOR_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_REGULATOR_H
 
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/ktime.h>
-#include <linux/tracepoint.h>
 
 /*
  * Events which just log themselves and the regulator name for enable/disable
  * type tracking.
  */
-DECLARE_EVENT_CLASS(regulator_basic,
+LTTNG_TRACEPOINT_EVENT_CLASS(regulator_basic,
 
        TP_PROTO(const char *name),
 
        TP_ARGS(name),
 
-       TP_STRUCT__entry(
-               __string(       name,   name    )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, name);
-       ),
-
-       TP_printk("name=%s", __get_str(name))
-
+       TP_FIELDS(
+               ctf_string(name, name)
+       )
 )
 
-DEFINE_EVENT(regulator_basic, regulator_enable,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_basic, regulator_enable,
 
        TP_PROTO(const char *name),
 
@@ -37,7 +30,7 @@ DEFINE_EVENT(regulator_basic, regulator_enable,
 
 )
 
-DEFINE_EVENT(regulator_basic, regulator_enable_delay,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_basic, regulator_enable_delay,
 
        TP_PROTO(const char *name),
 
@@ -45,7 +38,7 @@ DEFINE_EVENT(regulator_basic, regulator_enable_delay,
 
 )
 
-DEFINE_EVENT(regulator_basic, regulator_enable_complete,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_basic, regulator_enable_complete,
 
        TP_PROTO(const char *name),
 
@@ -53,7 +46,7 @@ DEFINE_EVENT(regulator_basic, regulator_enable_complete,
 
 )
 
-DEFINE_EVENT(regulator_basic, regulator_disable,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_basic, regulator_disable,
 
        TP_PROTO(const char *name),
 
@@ -61,7 +54,7 @@ DEFINE_EVENT(regulator_basic, regulator_disable,
 
 )
 
-DEFINE_EVENT(regulator_basic, regulator_disable_complete,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_basic, regulator_disable_complete,
 
        TP_PROTO(const char *name),
 
@@ -73,29 +66,20 @@ DEFINE_EVENT(regulator_basic, regulator_disable_complete,
  * Events that take a range of numerical values, mostly for voltages
  * and so on.
  */
-DECLARE_EVENT_CLASS(regulator_range,
+LTTNG_TRACEPOINT_EVENT_CLASS(regulator_range,
 
        TP_PROTO(const char *name, int min, int max),
 
        TP_ARGS(name, min, max),
 
-       TP_STRUCT__entry(
-               __string(       name,           name            )
-               __field(        int,            min             )
-               __field(        int,            max             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, name);
-               tp_assign(min, min);
-               tp_assign(max, max);
-       ),
-
-       TP_printk("name=%s (%d-%d)", __get_str(name),
-                 (int)__entry->min, (int)__entry->max)
+       TP_FIELDS(
+               ctf_string(name, name)
+               ctf_integer(int, min, min)
+               ctf_integer(int, max, max)
+       )
 )
 
-DEFINE_EVENT(regulator_range, regulator_set_voltage,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_range, regulator_set_voltage,
 
        TP_PROTO(const char *name, int min, int max),
 
@@ -107,27 +91,19 @@ DEFINE_EVENT(regulator_range, regulator_set_voltage,
 /*
  * Events that take a single value, mostly for readback and refcounts.
  */
-DECLARE_EVENT_CLASS(regulator_value,
+LTTNG_TRACEPOINT_EVENT_CLASS(regulator_value,
 
        TP_PROTO(const char *name, unsigned int val),
 
        TP_ARGS(name, val),
 
-       TP_STRUCT__entry(
-               __string(       name,           name            )
-               __field(        unsigned int,   val             )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, name);
-               tp_assign(val, val);
-       ),
-
-       TP_printk("name=%s, val=%u", __get_str(name),
-                 (int)__entry->val)
+       TP_FIELDS(
+               ctf_string(name, name)
+               ctf_integer(unsigned int, val, val)
+       )
 )
 
-DEFINE_EVENT(regulator_value, regulator_set_voltage_complete,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(regulator_value, regulator_set_voltage_complete,
 
        TP_PROTO(const char *name, unsigned int value),