X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fpower.h;h=1f6c6e8a48839c3689910f4ac65bd270255ce7ae;hb=b7cdc18250880cc44edeef4a4b42c8ac7a135a6d;hp=f366a63e460ee7f59f26f05d52ef82a654b87871;hpb=9cf29d3eaffa56199259919c90108de84724b4fb;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/power.h b/instrumentation/events/lttng-module/power.h index f366a63e..1f6c6e8a 100644 --- a/instrumentation/events/lttng-module/power.h +++ b/instrumentation/events/lttng-module/power.h @@ -1,35 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #undef TRACE_SYSTEM #define TRACE_SYSTEM power -#if !defined(_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_POWER_H +#if !defined(LTTNG_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_POWER_H +#include #include -#include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) -DECLARE_EVENT_CLASS(power_cpu, +LTTNG_TRACEPOINT_EVENT_CLASS(power_cpu, TP_PROTO(unsigned int state, unsigned int cpu_id), TP_ARGS(state, cpu_id), - TP_STRUCT__entry( - __field( u32, state ) - __field( u32, cpu_id ) - ), - - TP_fast_assign( - tp_assign(state, state) - tp_assign(cpu_id, cpu_id) - ), - - TP_printk("state=%lu cpu_id=%lu", (unsigned long)__entry->state, - (unsigned long)__entry->cpu_id) + TP_FIELDS( + ctf_integer(u32, state, state) + ctf_integer(u32, cpu_id, cpu_id) + ) ) -DEFINE_EVENT_MAP(power_cpu, cpu_idle, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_cpu, cpu_idle, power_cpu_idle, @@ -45,7 +37,7 @@ DEFINE_EVENT_MAP(power_cpu, cpu_idle, #define PWR_EVENT_EXIT -1 #endif -DEFINE_EVENT_MAP(power_cpu, cpu_frequency, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_cpu, cpu_frequency, power_cpu_frequency, @@ -54,7 +46,7 @@ DEFINE_EVENT_MAP(power_cpu, cpu_frequency, TP_ARGS(frequency, cpu_id) ) -TRACE_EVENT_MAP(machine_suspend, +LTTNG_TRACEPOINT_EVENT_MAP(machine_suspend, power_machine_suspend, @@ -62,40 +54,25 @@ TRACE_EVENT_MAP(machine_suspend, TP_ARGS(state), - TP_STRUCT__entry( - __field( u32, state ) - ), - - TP_fast_assign( - tp_assign(state, state) - ), - - TP_printk("state=%lu", (unsigned long)__entry->state) + TP_FIELDS( + ctf_integer(u32, state, state) + ) ) -#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) -DECLARE_EVENT_CLASS(power_wakeup_source, +LTTNG_TRACEPOINT_EVENT_CLASS(power_wakeup_source, TP_PROTO(const char *name, unsigned int state), TP_ARGS(name, state), - TP_STRUCT__entry( - __string( name, name ) - __field( u64, state ) - ), - - TP_fast_assign( - tp_strcpy(name, name) - tp_assign(state, state) - ), - - TP_printk("%s state=0x%lx", __get_str(name), - (unsigned long)__entry->state) + TP_FIELDS( + ctf_string(name, name) + ctf_integer(u64, state, state) + ) ) -DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_activate, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_activate, power_wakeup_source_activate, @@ -104,7 +81,7 @@ DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_activate, TP_ARGS(name, state) ) -DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_deactivate, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivate, power_wakeup_source_deactivate, @@ -114,114 +91,48 @@ DEFINE_EVENT_MAP(power_wakeup_source, wakeup_source_deactivate, ) #endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)) -#undef CONFIG_EVENT_POWER_TRACING_DEPRECATED -#define CONFIG_EVENT_POWER_TRACING_DEPRECATED -#define _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED -#endif - #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED /* * The power events are used for cpuidle & suspend (power_start, power_end) * and for cpufreq (power_frequency) */ -DECLARE_EVENT_CLASS(power, +LTTNG_TRACEPOINT_EVENT_CLASS(power, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), TP_ARGS(type, state, cpu_id), -#else - TP_PROTO(unsigned int type, unsigned int state), - - TP_ARGS(type, state), -#endif - TP_STRUCT__entry( - __field( u64, type ) - __field( u64, state ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - __field( u64, cpu_id ) -#endif - ), - - TP_fast_assign( - tp_assign(type, type) - tp_assign(state, state) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - tp_assign(cpu_id, cpu_id) -#endif - ), - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type, - (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) -#else - TP_printk("type=%lu state=%lu", (unsigned long)__entry->type, - (unsigned long)__entry->state) -#endif + TP_FIELDS( + ctf_integer(u64, type, type) + ctf_integer(u64, state, state) + ctf_integer(u64, cpu_id, cpu_id) + ) ) -DEFINE_EVENT(power, power_start, +LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_start, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), TP_ARGS(type, state, cpu_id) -#else - TP_PROTO(unsigned int type, unsigned int state), - - TP_ARGS(type, state) -#endif ) -DEFINE_EVENT(power, power_frequency, +LTTNG_TRACEPOINT_EVENT_INSTANCE(power, power_frequency, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id), TP_ARGS(type, state, cpu_id) -#else - TP_PROTO(unsigned int type, unsigned int state), - - TP_ARGS(type, state) -#endif ) -TRACE_EVENT(power_end, +LTTNG_TRACEPOINT_EVENT(power_end, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int cpu_id), TP_ARGS(cpu_id), -#else - TP_PROTO(int dummy), - - TP_ARGS(dummy), -#endif - - TP_STRUCT__entry( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - __field( u64, cpu_id ) -#else - __field( u64, dummy ) -#endif - ), - TP_fast_assign( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - tp_assign(cpu_id, cpu_id) -#else - tp_assign(dummy, 0xffff) -#endif - ), - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id) -#else - TP_printk("dummy=%lu", (unsigned long)__entry->dummy) -#endif + TP_FIELDS( + ctf_integer(u64, cpu_id, cpu_id) + ) ) /* Deprecated dummy functions must be protected against multi-declartion */ @@ -258,34 +169,24 @@ static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {}; #endif /* CONFIG_EVENT_POWER_TRACING_DEPRECATED */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) /* * The clock events are used for clock enable/disable and for * clock rate change */ -DECLARE_EVENT_CLASS(power_clock, +LTTNG_TRACEPOINT_EVENT_CLASS(power_clock, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id), TP_ARGS(name, state, cpu_id), - TP_STRUCT__entry( - __string( name, name ) - __field( u64, state ) - __field( u64, cpu_id ) - ), - - TP_fast_assign( - tp_strcpy(name, name) - tp_assign(state, state) - tp_assign(cpu_id, cpu_id) - ), - - TP_printk("%s state=%lu cpu_id=%lu", __get_str(name), - (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) + TP_FIELDS( + ctf_string(name, name) + ctf_integer(u64, state, state) + ctf_integer(u64, cpu_id, cpu_id) + ) ) -DEFINE_EVENT_MAP(power_clock, clock_enable, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_clock, clock_enable, power_clock_enable, @@ -294,7 +195,7 @@ DEFINE_EVENT_MAP(power_clock, clock_enable, TP_ARGS(name, state, cpu_id) ) -DEFINE_EVENT_MAP(power_clock, clock_disable, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_clock, clock_disable, power_clock_disable, @@ -303,7 +204,7 @@ DEFINE_EVENT_MAP(power_clock, clock_disable, TP_ARGS(name, state, cpu_id) ) -DEFINE_EVENT_MAP(power_clock, clock_set_rate, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_clock, clock_set_rate, power_clock_set_rate, @@ -315,37 +216,27 @@ DEFINE_EVENT_MAP(power_clock, clock_set_rate, /* * The power domain events are used for power domains transitions */ -DECLARE_EVENT_CLASS(power_domain, +LTTNG_TRACEPOINT_EVENT_CLASS(power_domain, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id), TP_ARGS(name, state, cpu_id), - TP_STRUCT__entry( - __string( name, name ) - __field( u64, state ) - __field( u64, cpu_id ) - ), - - TP_fast_assign( - tp_strcpy(name, name) - tp_assign(state, state) - tp_assign(cpu_id, cpu_id) -), - - TP_printk("%s state=%lu cpu_id=%lu", __get_str(name), - (unsigned long)__entry->state, (unsigned long)__entry->cpu_id) + TP_FIELDS( + ctf_string(name, name) + ctf_integer(u64, state, state) + ctf_integer(u64, cpu_id, cpu_id) + ) ) -DEFINE_EVENT(power_domain, power_domain_target, +LTTNG_TRACEPOINT_EVENT_INSTANCE(power_domain, power_domain_target, TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id), TP_ARGS(name, state, cpu_id) ) -#endif -#endif /* _TRACE_POWER_H */ +#endif /* LTTNG_TRACE_POWER_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include