X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fpower.h;h=1172fd7365f7e1d99b93ea003126614a88d57de4;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=02a803cdb8951ddabbb5bea9bf95e7612fb6c34b;hpb=3bc29f0a41b3c803245b845db2e1909042e72e9c;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/power.h b/instrumentation/events/lttng-module/power.h index 02a803cd..1172fd73 100644 --- a/instrumentation/events/lttng-module/power.h +++ b/instrumentation/events/lttng-module/power.h @@ -1,32 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #undef TRACE_SYSTEM #define TRACE_SYSTEM power #if !defined(LTTNG_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_POWER_H -#include "../../../probes/lttng-tracepoint-event.h" +#include #include -#include +#include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) 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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_cpu, cpu_idle, @@ -62,37 +54,22 @@ LTTNG_TRACEPOINT_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)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,5,0)) 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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_activate, @@ -114,12 +91,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivat ) #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 /* @@ -128,100 +99,40 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivat */ 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) + ) ) 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 ) 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 ) 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 */ @@ -249,7 +160,7 @@ enum { events get removed */ static inline void trace_power_start(u64 type, u64 state, u64 cpuid) {}; static inline void trace_power_end(u64 cpuid) {}; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0)) static inline void trace_power_start_rcuidle(u64 type, u64 state, u64 cpuid) {}; static inline void trace_power_end_rcuidle(u64 cpuid) {}; #endif @@ -258,7 +169,6 @@ 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 @@ -269,20 +179,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(power_clock, 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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_clock, clock_enable, @@ -321,20 +222,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(power_domain, 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) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE(power_domain, power_domain_target, @@ -343,9 +235,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(power_domain, power_domain_target, TP_ARGS(name, state, cpu_id) ) -#endif #endif /* LTTNG_TRACE_POWER_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include