X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fpower.h;h=f366a63e460ee7f59f26f05d52ef82a654b87871;hb=9cf29d3eaffa56199259919c90108de84724b4fb;hp=7eeb87ce1e8eb4e279516ead5672220c01d498b6;hpb=76e4f0175e477c9ad0368523e3c0dd2cbbfd3678;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/power.h b/instrumentation/events/lttng-module/power.h
index 7eeb87ce..f366a63e 100644
--- a/instrumentation/events/lttng-module/power.h
+++ b/instrumentation/events/lttng-module/power.h
@@ -9,7 +9,7 @@
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-DECLARE_EVENT_CLASS(cpu,
+DECLARE_EVENT_CLASS(power_cpu,
 
 	TP_PROTO(unsigned int state, unsigned int cpu_id),
 
@@ -29,7 +29,9 @@ DECLARE_EVENT_CLASS(cpu,
 		  (unsigned long)__entry->cpu_id)
 )
 
-DEFINE_EVENT(cpu, cpu_idle,
+DEFINE_EVENT_MAP(power_cpu, cpu_idle,
+
+	power_cpu_idle,
 
 	TP_PROTO(unsigned int state, unsigned int cpu_id),
 
@@ -43,14 +45,18 @@ DEFINE_EVENT(cpu, cpu_idle,
 #define PWR_EVENT_EXIT -1
 #endif
 
-DEFINE_EVENT(cpu, cpu_frequency,
+DEFINE_EVENT_MAP(power_cpu, cpu_frequency,
+
+	power_cpu_frequency,
 
 	TP_PROTO(unsigned int frequency, unsigned int cpu_id),
 
 	TP_ARGS(frequency, cpu_id)
 )
 
-TRACE_EVENT(machine_suspend,
+TRACE_EVENT_MAP(machine_suspend,
+
+	power_machine_suspend,
 
 	TP_PROTO(unsigned int state),
 
@@ -69,7 +75,7 @@ TRACE_EVENT(machine_suspend,
 #endif
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-DECLARE_EVENT_CLASS(wakeup_source,
+DECLARE_EVENT_CLASS(power_wakeup_source,
 
 	TP_PROTO(const char *name, unsigned int state),
 
@@ -89,14 +95,18 @@ DECLARE_EVENT_CLASS(wakeup_source,
 		(unsigned long)__entry->state)
 )
 
-DEFINE_EVENT(wakeup_source, wakeup_source_activate,
+DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_activate,
+
+	power_wakeup_source_activate,
 
 	TP_PROTO(const char *name, unsigned int state),
 
 	TP_ARGS(name, state)
 )
 
-DEFINE_EVENT(wakeup_source, wakeup_source_deactivate,
+DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_deactivate,
+
+	power_wakeup_source_deactivate,
 
 	TP_PROTO(const char *name, unsigned int state),
 
@@ -253,7 +263,7 @@ static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};
  * The clock events are used for clock enable/disable and for
  *  clock rate change
  */
-DECLARE_EVENT_CLASS(clock,
+DECLARE_EVENT_CLASS(power_clock,
 
 	TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 
@@ -275,21 +285,27 @@ DECLARE_EVENT_CLASS(clock,
 		(unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
 )
 
-DEFINE_EVENT(clock, clock_enable,
+DEFINE_EVENT_MAP(power_clock, clock_enable,
+
+	power_clock_enable,
 
 	TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 
 	TP_ARGS(name, state, cpu_id)
 )
 
-DEFINE_EVENT(clock, clock_disable,
+DEFINE_EVENT_MAP(power_clock, clock_disable,
+
+	power_clock_disable,
 
 	TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
 
 	TP_ARGS(name, state, cpu_id)
 )
 
-DEFINE_EVENT(clock, clock_set_rate,
+DEFINE_EVENT_MAP(power_clock, clock_set_rate,
+
+	power_clock_set_rate,
 
 	TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),