Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 100629
b: refs/heads/master
c: 842af31
h: refs/heads/master
i:
  100627: a1ed7a1
v: v3
  • Loading branch information
Ingo Molnar authored and Thomas Gleixner committed May 23, 2008
1 parent 24393d1 commit cb21c75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6dd24f8d00cbccb560b19a723e6fb9bdfb20799
refs/heads/master: 842af315e8b0adad58fc642eaa5e6f53525e0534
9 changes: 3 additions & 6 deletions trunk/kernel/trace/trace_sysprof.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ static int __read_mostly tracer_enabled;
* 10 msecs for now:
*/
static const unsigned long sample_period = 1000000;
static const unsigned int sample_max_depth = 512;

/*
* Per CPU hrtimers that do the profiling:
Expand All @@ -45,8 +46,6 @@ static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
return 1;
}

#define SYSPROF_MAX_ADDRESSES 512

static void timer_notify(struct pt_regs *regs, int cpu)
{
const void __user *frame_pointer;
Expand Down Expand Up @@ -80,7 +79,7 @@ static void timer_notify(struct pt_regs *regs, int cpu)

frame_pointer = (void __user *)regs->bp;

for (i = 0; i < SYSPROF_MAX_ADDRESSES; i++) {
for (i = 0; i < sample_max_depth; i++) {
if (!copy_stack_frame(frame_pointer, &frame))
break;
if ((unsigned long)frame_pointer < regs->sp)
Expand All @@ -93,7 +92,7 @@ static void timer_notify(struct pt_regs *regs, int cpu)

trace_special(tr, data, 2, current->pid, i);

if (i == SYSPROF_MAX_ADDRESSES)
if (i == sample_max_depth)
trace_special(tr, data, -1, -1, -1);
}

Expand Down Expand Up @@ -126,7 +125,6 @@ static void start_stack_timers(void)
for_each_online_cpu(cpu) {
set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
start_stack_timer(cpu);
printk(KERN_INFO "started sysprof timer on cpu%d\n", cpu);
}
set_cpus_allowed_ptr(current, &saved_mask);
}
Expand All @@ -136,7 +134,6 @@ static void stop_stack_timer(int cpu)
struct hrtimer *hrtimer = &per_cpu(stack_trace_hrtimer, cpu);

hrtimer_cancel(hrtimer);
printk(KERN_INFO "cancelled sysprof timer on cpu%d\n", cpu);
}

static void stop_stack_timers(void)
Expand Down

0 comments on commit cb21c75

Please sign in to comment.