History

tracing/fastboot: use sched switch tracer from boot tracer

Impact: enhance boot trace output with scheduling events Use the sched_switch tracer from the boot tracer. We also can trace schedule events inside the initcalls. Sched tracing is disabled after the initcall has finished and then reenabled before the next one is started.

Frederic Weisbecker committed 18 years ago

Commit d7ad44b1 parent e55f6054 files · +12 −3Browse files

Unified · Split

4 files
  1. kernel/trace/trace.c +2 −0
  2. kernel/trace/trace.h +1 −0
  3. kernel/trace/trace_boot.c +6 −0
  4. kernel/trace/trace_sched_switch.c +3 −3
kernel/trace/trace.c+2−0
@@ -3251,6 +3251,8 @@ __init static int tracer_alloc_buffers(void) · 3250 unmodified lines
3251 3251
3252 register_tracer(&nop_trace);3252 register_tracer(&nop_trace);
3253#ifdef CONFIG_BOOT_TRACER3253#ifdef CONFIG_BOOT_TRACER
3254 /* We don't want to launch sched_switch tracer yet */
3255 global_trace.ctrl = 0;
3254 register_tracer(&boot_tracer);3256 register_tracer(&boot_tracer);
3255 current_trace = &boot_tracer;3257 current_trace = &boot_tracer;
3256 current_trace->init(&global_trace);3258 current_trace->init(&global_trace);
kernel/trace/trace.h+1−0
@@ -49,6 +49,7 @@ struct ftrace_entry { · 48 unmodified lines
49 unsigned long parent_ip;49 unsigned long parent_ip;
50};50};
51extern struct tracer boot_tracer;51extern struct tracer boot_tracer;
52extern struct tracer sched_switch_trace; /* Used by the boot tracer */
52 53
53/*54/*
54 * Context switch trace entry - which task (and prio) we switched from/to:55 * Context switch trace entry - which task (and prio) we switched from/to:
kernel/trace/trace_boot.c+6−0
@@ -27,10 +27,14 @@ void start_boot_trace(void) · 26 unmodified lines
27 27
28void enable_boot_trace(void)28void enable_boot_trace(void)
29{29{
30 if (pre_initcalls_finished)
31 tracing_start_cmdline_record();
30}32}
31 33
32void disable_boot_trace(void)34void disable_boot_trace(void)
33{35{
36 if (pre_initcalls_finished)
37 tracing_stop_cmdline_record();
34}38}
35 39
36void reset_boot_trace(struct trace_array *tr)40void reset_boot_trace(struct trace_array *tr)
@@ -45,6 +49,8 @@ static void boot_trace_init(struct trace_array *tr) · 8 unmodified lines
45 49
46 for_each_cpu_mask(cpu, cpu_possible_map)50 for_each_cpu_mask(cpu, cpu_possible_map)
47 tracing_reset(tr, cpu);51 tracing_reset(tr, cpu);
52
53 sched_switch_trace.init(tr);
48}54}
49 55
50static void boot_trace_ctrl_update(struct trace_array *tr)56static void boot_trace_ctrl_update(struct trace_array *tr)
kernel/trace/trace_sched_switch.c+3−3
@@ -127,6 +127,7 @@ static void tracing_start_sched_switch(void) · 126 unmodified lines
127 long ref;127 long ref;
128 128
129 mutex_lock(&tracepoint_mutex);129 mutex_lock(&tracepoint_mutex);
130 tracer_enabled = 1;
130 ref = atomic_inc_return(&sched_ref);131 ref = atomic_inc_return(&sched_ref);
131 if (ref == 1)132 if (ref == 1)
132 tracing_sched_register();133 tracing_sched_register();
@@ -138,6 +139,7 @@ static void tracing_stop_sched_switch(void) · 5 unmodified lines
138 long ref;139 long ref;
139 140
140 mutex_lock(&tracepoint_mutex);141 mutex_lock(&tracepoint_mutex);
142 tracer_enabled = 0;
141 ref = atomic_dec_and_test(&sched_ref);143 ref = atomic_dec_and_test(&sched_ref);
142 if (ref)144 if (ref)
143 tracing_sched_unregister();145 tracing_sched_unregister();
@@ -158,12 +160,10 @@ static void start_sched_trace(struct trace_array *tr) · 14 unmodified lines
158{160{
159 sched_switch_reset(tr);161 sched_switch_reset(tr);
160 tracing_start_cmdline_record();162 tracing_start_cmdline_record();
161 tracer_enabled = 1;
162}163}
163 164
164static void stop_sched_trace(struct trace_array *tr)165static void stop_sched_trace(struct trace_array *tr)
165{166{
166 tracer_enabled = 0;
167 tracing_stop_cmdline_record();167 tracing_stop_cmdline_record();
168}168}
169 169
@@ -190,7 +190,7 @@ static void sched_switch_trace_ctrl_update(struct trace_array *tr) · 20 unmodified lines
190 stop_sched_trace(tr);190 stop_sched_trace(tr);
191}191}
192 192
193static struct tracer sched_switch_trace __read_mostly =193struct tracer sched_switch_trace __read_mostly =
194{194{
195 .name = "sched_switch",195 .name = "sched_switch",
196 .init = sched_switch_trace_init,196 .init = sched_switch_trace_init,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t