Skip to content

L
linux-davinci
Commit 73185e0a authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files
Options

drivers/oprofile: coding style fixes in buffer_sync.c 

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Cc: oprofile-list <oprofile-list@lists.sourceforge.net>
Cc: Barry Kasindorf <barry.kasindorf@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6657fe4f
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 54 deletions
drivers/oprofile/buffer_sync.c
View file @ 73185e0a
...@@ -48,10 +48,11 @@ static void process_task_mortuary(void); ...@@ -48,10 +48,11 @@ static void process_task_mortuary(void);
* Can be invoked from softirq via RCU callback due to * Can be invoked from softirq via RCU callback due to
* call_rcu() of the task struct, hence the _irqsave. * call_rcu() of the task struct, hence the _irqsave.
*/ */
static int task_free_notify(struct notifier_block * self, unsigned long val, void * data) static int
task_free_notify(struct notifier_block *self, unsigned long val, void *data)
{ {
unsigned long flags; unsigned long flags;
struct task_struct * task = data; struct task_struct *task = data;
spin_lock_irqsave(&task_mortuary, flags); spin_lock_irqsave(&task_mortuary, flags);
list_add(&task->tasks, &dying_tasks); list_add(&task->tasks, &dying_tasks);
spin_unlock_irqrestore(&task_mortuary, flags); spin_unlock_irqrestore(&task_mortuary, flags);
...@@ -62,7 +63,8 @@ static int task_free_notify(struct notifier_block * self, unsigned long val, voi ...@@ -62,7 +63,8 @@ static int task_free_notify(struct notifier_block * self, unsigned long val, voi
/* The task is on its way out. A sync of the buffer means we can catch /* The task is on its way out. A sync of the buffer means we can catch
* any remaining samples for this task. * any remaining samples for this task.
*/ */
static int task_exit_notify(struct notifier_block * self, unsigned long val, void * data) static int
task_exit_notify(struct notifier_block *self, unsigned long val, void *data)
{ {
/* To avoid latency problems, we only process the current CPU, /* To avoid latency problems, we only process the current CPU,
* hoping that most samples for the task are on this CPU * hoping that most samples for the task are on this CPU
...@@ -77,11 +79,12 @@ static int task_exit_notify(struct notifier_block * self, unsigned long val, voi ...@@ -77,11 +79,12 @@ static int task_exit_notify(struct notifier_block * self, unsigned long val, voi
* we don't lose any. This does not have to be exact, it's a QoI issue * we don't lose any. This does not have to be exact, it's a QoI issue
* only. * only.
*/ */
static int munmap_notify(struct notifier_block * self, unsigned long val, void * data) static int
munmap_notify(struct notifier_block *self, unsigned long val, void *data)
{ {
unsigned long addr = (unsigned long)data; unsigned long addr = (unsigned long)data;
struct mm_struct * mm = current->mm; struct mm_struct *mm = current->mm;
struct vm_area_struct * mpnt; struct vm_area_struct *mpnt;
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
...@@ -103,7 +106,8 @@ static int munmap_notify(struct notifier_block * self, unsigned long val, void * ...@@ -103,7 +106,8 @@ static int munmap_notify(struct notifier_block * self, unsigned long val, void *
/* We need to be told about new modules so we don't attribute to a previously /* We need to be told about new modules so we don't attribute to a previously
* loaded module, or drop the samples on the floor. * loaded module, or drop the samples on the floor.
*/ */
static int module_load_notify(struct notifier_block * self, unsigned long val, void * data) static int
module_load_notify(struct notifier_block *self, unsigned long val, void *data)
{ {
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
if (val != MODULE_STATE_COMING) if (val != MODULE_STATE_COMING)
...@@ -208,10 +212,10 @@ static inline unsigned long fast_get_dcookie(struct path *path) ...@@ -208,10 +212,10 @@ static inline unsigned long fast_get_dcookie(struct path *path)
* not strictly necessary but allows oprofile to associate * not strictly necessary but allows oprofile to associate
* shared-library samples with particular applications * shared-library samples with particular applications
*/ */
static unsigned long get_exec_dcookie(struct mm_struct * mm) static unsigned long get_exec_dcookie(struct mm_struct *mm)
{ {
unsigned long cookie = NO_COOKIE; unsigned long cookie = NO_COOKIE;
struct vm_area_struct * vma; struct vm_area_struct *vma;
if (!mm) if (!mm)
goto out; goto out;
...@@ -235,10 +239,11 @@ out: ...@@ -235,10 +239,11 @@ out:
* sure to do this lookup before a mm->mmap modification happens so * sure to do this lookup before a mm->mmap modification happens so
* we don't lose track. * we don't lose track.
*/ */
static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, off_t * offset) static unsigned long
lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
{ {
unsigned long cookie = NO_COOKIE; unsigned long cookie = NO_COOKIE;
struct vm_area_struct * vma; struct vm_area_struct *vma;
for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) { for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) {
...@@ -284,7 +289,7 @@ static void add_kernel_ctx_switch(unsigned int in_kernel) ...@@ -284,7 +289,7 @@ static void add_kernel_ctx_switch(unsigned int in_kernel)
} }
static void static void
add_user_ctx_switch(struct task_struct const * task, unsigned long cookie) add_user_ctx_switch(struct task_struct const *task, unsigned long cookie)
{ {
add_event_entry(ESCAPE_CODE); add_event_entry(ESCAPE_CODE);
add_event_entry(CTX_SWITCH_CODE); add_event_entry(CTX_SWITCH_CODE);
...@@ -319,7 +324,7 @@ static void add_sample_entry(unsigned long offset, unsigned long event) ...@@ -319,7 +324,7 @@ static void add_sample_entry(unsigned long offset, unsigned long event)
} }
static int add_us_sample(struct mm_struct * mm, struct op_sample * s) static int add_us_sample(struct mm_struct *mm, struct op_sample *s)
{ {
unsigned long cookie; unsigned long cookie;
off_t offset; off_t offset;
...@@ -347,7 +352,7 @@ static int add_us_sample(struct mm_struct * mm, struct op_sample * s) ...@@ -347,7 +352,7 @@ static int add_us_sample(struct mm_struct * mm, struct op_sample * s)
* for later lookup from userspace. * for later lookup from userspace.
*/ */
static int static int
add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel) add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
{ {
if (in_kernel) { if (in_kernel) {
add_sample_entry(s->eip, s->event); add_sample_entry(s->eip, s->event);
...@@ -361,7 +366,7 @@ add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel) ...@@ -361,7 +366,7 @@ add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)
} }
static void release_mm(struct mm_struct * mm) static void release_mm(struct mm_struct *mm)
{ {
if (!mm) if (!mm)
return; return;
...@@ -370,9 +375,9 @@ static void release_mm(struct mm_struct * mm) ...@@ -370,9 +375,9 @@ static void release_mm(struct mm_struct * mm)
} }
static struct mm_struct * take_tasks_mm(struct task_struct * task) static struct mm_struct *take_tasks_mm(struct task_struct *task)
{ {
struct mm_struct * mm = get_task_mm(task); struct mm_struct *mm = get_task_mm(task);
if (mm) if (mm)
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
return mm; return mm;
...@@ -386,7 +391,7 @@ static inline int is_code(unsigned long val) ...@@ -386,7 +391,7 @@ static inline int is_code(unsigned long val)
/* "acquire" as many cpu buffer slots as we can */ /* "acquire" as many cpu buffer slots as we can */
static unsigned long get_slots(struct oprofile_cpu_buffer * b) static unsigned long get_slots(struct oprofile_cpu_buffer *b)
{ {
unsigned long head = b->head_pos; unsigned long head = b->head_pos;
unsigned long tail = b->tail_pos; unsigned long tail = b->tail_pos;
...@@ -412,7 +417,7 @@ static unsigned long get_slots(struct oprofile_cpu_buffer * b) ...@@ -412,7 +417,7 @@ static unsigned long get_slots(struct oprofile_cpu_buffer * b)
} }
static void increment_tail(struct oprofile_cpu_buffer * b) static void increment_tail(struct oprofile_cpu_buffer *b)
{ {
unsigned long new_tail = b->tail_pos + 1; unsigned long new_tail = b->tail_pos + 1;
...@@ -435,8 +440,8 @@ static void process_task_mortuary(void) ...@@ -435,8 +440,8 @@ static void process_task_mortuary(void)
{ {
unsigned long flags; unsigned long flags;
LIST_HEAD(local_dead_tasks); LIST_HEAD(local_dead_tasks);
struct task_struct * task; struct task_struct *task;
struct task_struct * ttask; struct task_struct *ttask;
spin_lock_irqsave(&task_mortuary, flags); spin_lock_irqsave(&task_mortuary, flags);
...@@ -493,7 +498,7 @@ void sync_buffer(int cpu) ...@@ -493,7 +498,7 @@ void sync_buffer(int cpu)
{ {
struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu); struct oprofile_cpu_buffer *cpu_buf = &per_cpu(cpu_buffer, cpu);
struct mm_struct *mm = NULL; struct mm_struct *mm = NULL;
struct task_struct * new; struct task_struct *new;
unsigned long cookie = 0; unsigned long cookie = 0;
int in_kernel = 1; int in_kernel = 1;
unsigned int i; unsigned int i;
...@@ -509,7 +514,7 @@ void sync_buffer(int cpu) ...@@ -509,7 +514,7 @@ void sync_buffer(int cpu)
available = get_slots(cpu_buf); available = get_slots(cpu_buf);
for (i = 0; i < available; ++i) { for (i = 0; i < available; ++i) {
struct op_sample * s = &cpu_buf->buffer[cpu_buf->tail_pos]; struct op_sample *s = &cpu_buf->buffer[cpu_buf->tail_pos];
if (is_code(s->eip)) { if (is_code(s->eip)) {
if (s->event <= CPU_IS_KERNEL) { if (s->event <= CPU_IS_KERNEL) {
...@@ -522,7 +527,7 @@ void sync_buffer(int cpu) ...@@ -522,7 +527,7 @@ void sync_buffer(int cpu)
state = sb_bt_start; state = sb_bt_start;
add_trace_begin(); add_trace_begin();
} else { } else {
struct mm_struct * oldmm = mm; struct mm_struct *oldmm = mm;
/* userspace context switch */ /* userspace context switch */
new = (struct task_struct *)s->event; new = (struct task_struct *)s->event;
...@@ -533,15 +538,13 @@ void sync_buffer(int cpu) ...@@ -533,15 +538,13 @@ void sync_buffer(int cpu)
cookie = get_exec_dcookie(mm); cookie = get_exec_dcookie(mm);
add_user_ctx_switch(new, cookie); add_user_ctx_switch(new, cookie);
} }
} else { } else if (state >= sb_bt_start &&
if (state >= sb_bt_start &&
!add_sample(mm, s, in_kernel)) { !add_sample(mm, s, in_kernel)) {
if (state == sb_bt_start) { if (state == sb_bt_start) {
state = sb_bt_ignore; state = sb_bt_ignore;
atomic_inc(&oprofile_stats.bt_lost_no_mapping); atomic_inc(&oprofile_stats.bt_lost_no_mapping);
} }
} }
}
increment_tail(cpu_buf); increment_tail(cpu_buf);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment