X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fregulator.h;h=bfdb6b65e5c5f32f3172b3cc623768f1cf720f29;hb=3b4aafcbbef722c5d04f2fe06a47c47d4d23eda0;hp=bb84c47ccd956adf292ab411f81c75fdc0d14b77;hpb=d3ac4d63d21c643df5b09d9d7888eb0c4122379c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/regulator.h b/instrumentation/events/lttng-module/regulator.h
index bb84c47c..bfdb6b65 100644
--- a/instrumentation/events/lttng-module/regulator.h
+++ b/instrumentation/events/lttng-module/regulator.h
@@ -1,35 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #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 <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 +31,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 +39,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 +47,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 +55,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 +67,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 +92,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),
 
@@ -138,4 +115,4 @@ DEFINE_EVENT(regulator_value, regulator_set_voltage_complete,
 #endif /* _TRACE_POWER_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <lttng/define_trace.h>