Skip to content

Commit

Permalink
tracing: remove unused local variables in tracer probe functions
Browse files Browse the repository at this point in the history
When the nsecs_to_usecs() conversion in probe_wakeup_sched_switch() and
check_critical_timing() was moved to a later stage in order to avoid
unnecessary computing, it was overlooked to remove the original
variables, assignments and comments..

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 fe63b94 commit 41dfba4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
12 changes: 1 addition & 11 deletions kernel/trace/trace_irqsoff.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,10 @@ check_critical_timing(struct trace_array *tr,
unsigned long parent_ip,
int cpu)
{
unsigned long latency, t0, t1;
cycle_t T0, T1, delta;
unsigned long flags;
int pc;

/*
* usecs conversion is slow so we try to delay the conversion
* as long as possible:
*/
T0 = data->preempt_timestamp;
T1 = ftrace_now(cpu);
delta = T1-T0;
Expand All @@ -157,17 +152,12 @@ check_critical_timing(struct trace_array *tr,

trace_function(tr, CALLER_ADDR0, parent_ip, flags, pc);

latency = nsecs_to_usecs(delta);

if (data->critical_sequence != max_sequence)
goto out_unlock;

tracing_max_latency = delta;
t0 = nsecs_to_usecs(T0);
t1 = nsecs_to_usecs(T1);

data->critical_end = parent_ip;

tracing_max_latency = delta;
update_max_tr_single(tr, current, cpu);

max_sequence++;
Expand Down
10 changes: 0 additions & 10 deletions kernel/trace/trace_sched_wakeup.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ static void notrace
probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,
struct task_struct *next)
{
unsigned long latency = 0, t0 = 0, t1 = 0;
struct trace_array_cpu *data;
cycle_t T0, T1, delta;
unsigned long flags;
Expand Down Expand Up @@ -156,23 +155,14 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,
trace_function(wakeup_trace, CALLER_ADDR0, CALLER_ADDR1, flags, pc);
tracing_sched_switch_trace(wakeup_trace, prev, next, flags, pc);

/*
* usecs conversion is slow so we try to delay the conversion
* as long as possible:
*/
T0 = data->preempt_timestamp;
T1 = ftrace_now(cpu);
delta = T1-T0;

if (!report_latency(delta))
goto out_unlock;

latency = nsecs_to_usecs(delta);

tracing_max_latency = delta;
t0 = nsecs_to_usecs(T0);
t1 = nsecs_to_usecs(T1);

update_max_tr(wakeup_trace, wakeup_task, wakeup_cpu);

out_unlock:
Expand Down

0 comments on commit 41dfba4

Please sign in to comment.