mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-19 17:11:03 +00:00
25e41933b5
Add these new power trace events: power:cpu_idle power:cpu_frequency power:machine_suspend The old C-state/idle accounting events: power:power_start power:power_end Have now a replacement (but we are still keeping the old tracepoints for compatibility): power:cpu_idle and power:power_frequency is replaced with: power:cpu_frequency power:machine_suspend is newly introduced. Jean Pihet has a patch integrated into the generic layer (kernel/power/suspend.c) which will make use of it. the type= field got removed from both, it was never used and the type is differed by the event type itself. perf timechart userspace tool gets adjusted in a separate patch. Signed-off-by: Thomas Renninger <trenn@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Arjan van de Ven <arjan@linux.intel.com> Acked-by: Jean Pihet <jean.pihet@newoldbits.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: rjw@sisk.pl LKML-Reference: <1294073445-14812-3-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de>
240 lines
5.2 KiB
C
240 lines
5.2 KiB
C
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM power
|
|
|
|
#if !defined(_TRACE_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_POWER_H
|
|
|
|
#include <linux/ktime.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
DECLARE_EVENT_CLASS(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(
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("state=%lu cpu_id=%lu", (unsigned long)__entry->state,
|
|
(unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(cpu, cpu_idle,
|
|
|
|
TP_PROTO(unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(state, cpu_id)
|
|
);
|
|
|
|
/* This file can get included multiple times, TRACE_HEADER_MULTI_READ at top */
|
|
#ifndef _PWR_EVENT_AVOID_DOUBLE_DEFINING
|
|
#define _PWR_EVENT_AVOID_DOUBLE_DEFINING
|
|
|
|
#define PWR_EVENT_EXIT -1
|
|
#endif
|
|
|
|
DEFINE_EVENT(cpu, cpu_frequency,
|
|
|
|
TP_PROTO(unsigned int frequency, unsigned int cpu_id),
|
|
|
|
TP_ARGS(frequency, cpu_id)
|
|
);
|
|
|
|
TRACE_EVENT(machine_suspend,
|
|
|
|
TP_PROTO(unsigned int state),
|
|
|
|
TP_ARGS(state),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u32, state )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->state = state;
|
|
),
|
|
|
|
TP_printk("state=%lu", (unsigned long)__entry->state)
|
|
);
|
|
|
|
/* This code will be removed after deprecation time exceeded (2.6.41) */
|
|
#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,
|
|
|
|
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(type, state, cpu_id),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u64, type )
|
|
__field( u64, state )
|
|
__field( u64, cpu_id )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->type = type;
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("type=%lu state=%lu cpu_id=%lu", (unsigned long)__entry->type,
|
|
(unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(power, power_start,
|
|
|
|
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(type, state, cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(power, power_frequency,
|
|
|
|
TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(type, state, cpu_id)
|
|
);
|
|
|
|
TRACE_EVENT(power_end,
|
|
|
|
TP_PROTO(unsigned int cpu_id),
|
|
|
|
TP_ARGS(cpu_id),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( u64, cpu_id )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("cpu_id=%lu", (unsigned long)__entry->cpu_id)
|
|
|
|
);
|
|
|
|
/* Deprecated dummy functions must be protected against multi-declartion */
|
|
#ifndef _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED
|
|
#define _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED
|
|
|
|
enum {
|
|
POWER_NONE = 0,
|
|
POWER_CSTATE = 1,
|
|
POWER_PSTATE = 2,
|
|
};
|
|
#endif /* _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED */
|
|
|
|
#else /* CONFIG_EVENT_POWER_TRACING_DEPRECATED */
|
|
|
|
#ifndef _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED
|
|
#define _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED
|
|
enum {
|
|
POWER_NONE = 0,
|
|
POWER_CSTATE = 1,
|
|
POWER_PSTATE = 2,
|
|
};
|
|
|
|
/* These dummy declaration have to be ripped out when the deprecated
|
|
events get removed */
|
|
static inline void trace_power_start(u64 type, u64 state, u64 cpuid) {};
|
|
static inline void trace_power_end(u64 cpuid) {};
|
|
static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};
|
|
#endif /* _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED */
|
|
|
|
#endif /* CONFIG_EVENT_POWER_TRACING_DEPRECATED */
|
|
|
|
/*
|
|
* The clock events are used for clock enable/disable and for
|
|
* clock rate change
|
|
*/
|
|
DECLARE_EVENT_CLASS(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(
|
|
__assign_str(name, name);
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("%s state=%lu cpu_id=%lu", __get_str(name),
|
|
(unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(clock, 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,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(clock, clock_set_rate,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
|
|
/*
|
|
* The power domain events are used for power domains transitions
|
|
*/
|
|
DECLARE_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(
|
|
__assign_str(name, name);
|
|
__entry->state = state;
|
|
__entry->cpu_id = cpu_id;
|
|
),
|
|
|
|
TP_printk("%s state=%lu cpu_id=%lu", __get_str(name),
|
|
(unsigned long)__entry->state, (unsigned long)__entry->cpu_id)
|
|
);
|
|
|
|
DEFINE_EVENT(power_domain, power_domain_target,
|
|
|
|
TP_PROTO(const char *name, unsigned int state, unsigned int cpu_id),
|
|
|
|
TP_ARGS(name, state, cpu_id)
|
|
);
|
|
#endif /* _TRACE_POWER_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|