Commit 213cc060 authored by Pekka J Enberg's avatar Pekka J Enberg Committed by Ingo Molnar

ftrace: introduce tracing_reset_online_cpus() helper

Impact: cleanup

This patch factors out common code from multiple tracers into a
tracing_reset_online_cpus() function and converts the tracers to use it.
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 30cd324e
...@@ -679,6 +679,16 @@ void tracing_reset(struct trace_array *tr, int cpu) ...@@ -679,6 +679,16 @@ void tracing_reset(struct trace_array *tr, int cpu)
ftrace_enable_cpu(); ftrace_enable_cpu();
} }
void tracing_reset_online_cpus(struct trace_array *tr)
{
int cpu;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu)
tracing_reset(tr, cpu);
}
#define SAVED_CMDLINES 128 #define SAVED_CMDLINES 128
static unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1]; static unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];
static unsigned map_cmdline_to_pid[SAVED_CMDLINES]; static unsigned map_cmdline_to_pid[SAVED_CMDLINES];
......
...@@ -374,6 +374,7 @@ struct trace_iterator { ...@@ -374,6 +374,7 @@ struct trace_iterator {
int tracing_is_enabled(void); int tracing_is_enabled(void);
void trace_wake_up(void); void trace_wake_up(void);
void tracing_reset(struct trace_array *tr, int cpu); void tracing_reset(struct trace_array *tr, int cpu);
void tracing_reset_online_cpus(struct trace_array *tr);
int tracing_open_generic(struct inode *inode, struct file *filp); int tracing_open_generic(struct inode *inode, struct file *filp);
struct dentry *tracing_init_dentry(void); struct dentry *tracing_init_dentry(void);
void init_tracer_sysprof_debugfs(struct dentry *d_tracer); void init_tracer_sysprof_debugfs(struct dentry *d_tracer);
......
...@@ -37,16 +37,6 @@ void disable_boot_trace(void) ...@@ -37,16 +37,6 @@ void disable_boot_trace(void)
tracing_stop_sched_switch_record(); tracing_stop_sched_switch_record();
} }
static void reset_boot_trace(struct trace_array *tr)
{
int cpu;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu)
tracing_reset(tr, cpu);
}
static int boot_trace_init(struct trace_array *tr) static int boot_trace_init(struct trace_array *tr)
{ {
int cpu; int cpu;
...@@ -130,7 +120,7 @@ struct tracer boot_tracer __read_mostly = ...@@ -130,7 +120,7 @@ struct tracer boot_tracer __read_mostly =
{ {
.name = "initcall", .name = "initcall",
.init = boot_trace_init, .init = boot_trace_init,
.reset = reset_boot_trace, .reset = tracing_reset_online_cpus,
.print_line = initcall_print_line, .print_line = initcall_print_line,
}; };
......
...@@ -16,20 +16,10 @@ ...@@ -16,20 +16,10 @@
#include "trace.h" #include "trace.h"
static void function_reset(struct trace_array *tr)
{
int cpu;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu)
tracing_reset(tr, cpu);
}
static void start_function_trace(struct trace_array *tr) static void start_function_trace(struct trace_array *tr)
{ {
tr->cpu = get_cpu(); tr->cpu = get_cpu();
function_reset(tr); tracing_reset_online_cpus(tr);
put_cpu(); put_cpu();
tracing_start_cmdline_record(); tracing_start_cmdline_record();
...@@ -55,7 +45,7 @@ static void function_trace_reset(struct trace_array *tr) ...@@ -55,7 +45,7 @@ static void function_trace_reset(struct trace_array *tr)
static void function_trace_start(struct trace_array *tr) static void function_trace_start(struct trace_array *tr)
{ {
function_reset(tr); tracing_reset_online_cpus(tr);
} }
static struct tracer function_trace __read_mostly = static struct tracer function_trace __read_mostly =
......
...@@ -25,16 +25,6 @@ static DEFINE_PER_CPU(unsigned char[SIZEOF_BTS], buffer); ...@@ -25,16 +25,6 @@ static DEFINE_PER_CPU(unsigned char[SIZEOF_BTS], buffer);
#define this_buffer per_cpu(buffer, smp_processor_id()) #define this_buffer per_cpu(buffer, smp_processor_id())
static void bts_trace_reset(struct trace_array *tr)
{
int cpu;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu)
tracing_reset(tr, cpu);
}
static void bts_trace_start_cpu(void *arg) static void bts_trace_start_cpu(void *arg)
{ {
if (this_tracer) if (this_tracer)
...@@ -54,7 +44,7 @@ static void bts_trace_start(struct trace_array *tr) ...@@ -54,7 +44,7 @@ static void bts_trace_start(struct trace_array *tr)
{ {
int cpu; int cpu;
bts_trace_reset(tr); tracing_reset_online_cpus(tr);
for_each_cpu_mask(cpu, cpu_possible_map) for_each_cpu_mask(cpu, cpu_possible_map)
smp_call_function_single(cpu, bts_trace_start_cpu, NULL, 1); smp_call_function_single(cpu, bts_trace_start_cpu, NULL, 1);
...@@ -78,7 +68,7 @@ static void bts_trace_stop(struct trace_array *tr) ...@@ -78,7 +68,7 @@ static void bts_trace_stop(struct trace_array *tr)
static int bts_trace_init(struct trace_array *tr) static int bts_trace_init(struct trace_array *tr)
{ {
bts_trace_reset(tr); tracing_reset_online_cpus(tr);
bts_trace_start(tr); bts_trace_start(tr);
return 0; return 0;
......
...@@ -22,14 +22,10 @@ static unsigned long prev_overruns; ...@@ -22,14 +22,10 @@ static unsigned long prev_overruns;
static void mmio_reset_data(struct trace_array *tr) static void mmio_reset_data(struct trace_array *tr)
{ {
int cpu;
overrun_detected = false; overrun_detected = false;
prev_overruns = 0; prev_overruns = 0;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu) tracing_reset_online_cpus(tr);
tracing_reset(tr, cpu);
} }
static int mmio_trace_init(struct trace_array *tr) static int mmio_trace_init(struct trace_array *tr)
......
...@@ -72,16 +72,6 @@ probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee) ...@@ -72,16 +72,6 @@ probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee)
local_irq_restore(flags); local_irq_restore(flags);
} }
static void sched_switch_reset(struct trace_array *tr)
{
int cpu;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu)
tracing_reset(tr, cpu);
}
static int tracing_sched_register(void) static int tracing_sched_register(void)
{ {
int ret; int ret;
...@@ -197,7 +187,7 @@ void tracing_sched_switch_assign_trace(struct trace_array *tr) ...@@ -197,7 +187,7 @@ void tracing_sched_switch_assign_trace(struct trace_array *tr)
static void start_sched_trace(struct trace_array *tr) static void start_sched_trace(struct trace_array *tr)
{ {
sched_switch_reset(tr); tracing_reset_online_cpus(tr);
tracing_start_sched_switch_record(); tracing_start_sched_switch_record();
} }
...@@ -221,7 +211,7 @@ static void sched_switch_trace_reset(struct trace_array *tr) ...@@ -221,7 +211,7 @@ static void sched_switch_trace_reset(struct trace_array *tr)
static void sched_switch_trace_start(struct trace_array *tr) static void sched_switch_trace_start(struct trace_array *tr)
{ {
sched_switch_reset(tr); tracing_reset_online_cpus(tr);
tracing_start_sched_switch(); tracing_start_sched_switch();
} }
......
...@@ -234,20 +234,10 @@ static void stop_stack_timers(void) ...@@ -234,20 +234,10 @@ static void stop_stack_timers(void)
stop_stack_timer(cpu); stop_stack_timer(cpu);
} }
static void stack_reset(struct trace_array *tr)
{
int cpu;
tr->time_start = ftrace_now(tr->cpu);
for_each_online_cpu(cpu)
tracing_reset(tr, cpu);
}
static void start_stack_trace(struct trace_array *tr) static void start_stack_trace(struct trace_array *tr)
{ {
mutex_lock(&sample_timer_lock); mutex_lock(&sample_timer_lock);
stack_reset(tr); tracing_reset_online_cpus(tr);
start_stack_timers(); start_stack_timers();
tracer_enabled = 1; tracer_enabled = 1;
mutex_unlock(&sample_timer_lock); mutex_unlock(&sample_timer_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment