Skip to content

Commit

Permalink
tracing: do not update tracing_max_latency when tracer is stopped
Browse files Browse the repository at this point in the history
The state of the function pair tracing_stop()/tracing_start() is
correctly considered when tracer data are updated. However, the global
and externally accessible variable tracing_max_latency is always updated
- even when tracing is stopped.

The update should only occur, if tracing was not stopped.

Signed-off-by: Carsten Emde <C.Emde@osadl.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Carsten Emde authored and Steven Rostedt committed Sep 13, 2009
1 parent 41dfba4 commit b5130b1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
5 changes: 5 additions & 0 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,11 @@ static void trace_init_cmdlines(void)
cmdline_idx = 0;
}

int is_tracing_stopped(void)
{
return trace_stop_count;
}

/**
* ftrace_off_permanent - disable all ftrace code permanently
*
Expand Down
1 change: 1 addition & 0 deletions kernel/trace/trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ void tracing_stop_sched_switch_record(void);
void tracing_start_sched_switch_record(void);
int register_tracer(struct tracer *type);
void unregister_tracer(struct tracer *type);
int is_tracing_stopped(void);

extern unsigned long nsecs_to_usecs(unsigned long nsecs);

Expand Down
6 changes: 4 additions & 2 deletions kernel/trace/trace_irqsoff.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,10 @@ check_critical_timing(struct trace_array *tr,

data->critical_end = parent_ip;

tracing_max_latency = delta;
update_max_tr_single(tr, current, cpu);
if (likely(!is_tracing_stopped())) {
tracing_max_latency = delta;
update_max_tr_single(tr, current, cpu);
}

max_sequence++;

Expand Down
6 changes: 4 additions & 2 deletions kernel/trace/trace_sched_wakeup.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,
if (!report_latency(delta))
goto out_unlock;

tracing_max_latency = delta;
update_max_tr(wakeup_trace, wakeup_task, wakeup_cpu);
if (likely(!is_tracing_stopped())) {
tracing_max_latency = delta;
update_max_tr(wakeup_trace, wakeup_task, wakeup_cpu);
}

out_unlock:
__wakeup_reset(wakeup_trace);
Expand Down

0 comments on commit b5130b1

Please sign in to comment.