Skip to contentSkip to conversation

trace: Use tracing_reset_online_cpus in more places

PATCH Applied Arnaldo Carvalho de Melo 3 participants 3 messages Jan 28, 2009 – Jan 29, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trace: Use tracing_reset_online_cpus in more places

Impact: cleanup

Cc Frédéric Weisbecker <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
kernel/trace/trace_branch.c +1 -5
index ca017e0..1284145 100644
@@ -133,11 +133,7 @@ static void stop_branch_trace(struct trace_array *tr)
 
 static int branch_trace_init(struct trace_array *tr)
 {
-	int cpu;
-
-	for_each_online_cpu(cpu)
-		tracing_reset(tr, cpu);
-
+	tracing_reset_online_cpus(tr);
 	start_branch_trace(tr);
 	return 0;
 }
kernel/trace/trace_functions_graph.c +2 -6
index 66fc7b8..c97594d 100644
@@ -52,15 +52,11 @@ static struct tracer_flags tracer_flags = {
 
 static int graph_trace_init(struct trace_array *tr)
 {
-	int cpu, ret;
-
-	for_each_online_cpu(cpu)
-		tracing_reset(tr, cpu);
-
-	ret = register_ftrace_graph(&trace_graph_return,
+	int ret = register_ftrace_graph(&trace_graph_return,
 					&trace_graph_entry);
 	if (ret)
 		return ret;
+	tracing_reset_online_cpus(tr);
 	tracing_start_cmdline_record();
 
 	return 0;
kernel/trace/trace_nop.c +1 -5
index b9767ac..087b6cb 100644
@@ -47,12 +47,8 @@ static void stop_nop_trace(struct trace_array *tr)
 
 static int nop_trace_init(struct trace_array *tr)
 {
-	int cpu;
 	ctx_trace = tr;
-
-	for_each_online_cpu(cpu)
-		tracing_reset(tr, cpu);
-
+	tracing_reset_online_cpus(tr);
 	start_nop_trace(tr);
 	return 0;
 }
Acked-by on v1 1/1
#1 lore raw

2009/1/28 Arnaldo Carvalho de Melo <[email protected]>:

Quoted 55 lines

Impact: cleanup

Cc Frédéric Weisbecker <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
kernel/trace/trace_branch.c +1 -5
index ca017e0..1284145 100644
@@ -133,11 +133,7 @@ static void stop_branch_trace(struct trace_array *tr)
 
 static int branch_trace_init(struct trace_array *tr)
 {
-       int cpu;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
+       tracing_reset_online_cpus(tr);
       start_branch_trace(tr);
       return 0;
 }
kernel/trace/trace_functions_graph.c +2 -6
index 66fc7b8..c97594d 100644
@@ -52,15 +52,11 @@ static struct tracer_flags tracer_flags = {
 
 static int graph_trace_init(struct trace_array *tr)
 {
-       int cpu, ret;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
-       ret = register_ftrace_graph(&trace_graph_return,
+       int ret = register_ftrace_graph(&trace_graph_return,
                                       &trace_graph_entry);
       if (ret)
               return ret;
+       tracing_reset_online_cpus(tr);
       tracing_start_cmdline_record();
 
       return 0;
kernel/trace/trace_nop.c +0 -0
index b9767ac..087b6cb 100644
@@ -47,12 +47,8 @@ static void stop_nop_trace(struct trace_array *tr)
 
 static int nop_trace_init(struct trace_array *tr)
 {

kernel/trace/trace_nop.c static void stop_nop_trace(struct trace_array *tr) · line 54

Quoted 10 lines
kernel/trace/trace_nop.c +1 -5
-       int cpu;
       ctx_trace = tr;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
+       tracing_reset_online_cpus(tr);
       start_nop_trace(tr);
       return 0;
 }

Thanks :-)

Applied
#2 lore raw
Quoted 69 lines · Frédéric Weisbecker

2009/1/28 Arnaldo Carvalho de Melo <[email protected]>:

Quoted 55 lines

Impact: cleanup

Cc Frédéric Weisbecker <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Ingo Molnar <[email protected]>
kernel/trace/trace_branch.c +1 -5
index ca017e0..1284145 100644
@@ -133,11 +133,7 @@ static void stop_branch_trace(struct trace_array *tr)
 
 static int branch_trace_init(struct trace_array *tr)
 {
-       int cpu;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
+       tracing_reset_online_cpus(tr);
       start_branch_trace(tr);
       return 0;
 }
kernel/trace/trace_functions_graph.c +2 -6
index 66fc7b8..c97594d 100644
@@ -52,15 +52,11 @@ static struct tracer_flags tracer_flags = {
 
 static int graph_trace_init(struct trace_array *tr)
 {
-       int cpu, ret;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
-       ret = register_ftrace_graph(&trace_graph_return,
+       int ret = register_ftrace_graph(&trace_graph_return,
                                       &trace_graph_entry);
       if (ret)
               return ret;
+       tracing_reset_online_cpus(tr);
       tracing_start_cmdline_record();
 
       return 0;
kernel/trace/trace_nop.c +0 -0
index b9767ac..087b6cb 100644
@@ -47,12 +47,8 @@ static void stop_nop_trace(struct trace_array *tr)
 
 static int nop_trace_init(struct trace_array *tr)
 {

kernel/trace/trace_nop.c static void stop_nop_trace(struct trace_array *tr) · line 54

Quoted 10 lines
kernel/trace/trace_nop.c +1 -5
-       int cpu;
       ctx_trace = tr;
-
-       for_each_online_cpu(cpu)
-               tracing_reset(tr, cpu);
-
+       tracing_reset_online_cpus(tr);
       start_nop_trace(tr);
       return 0;
 }

Thanks :-)

Quoted 1 line

Applied to tip/tracing/ftrace (with your Ack added), thanks guys!

Ingo