trace_workqueues: fix empty line's output
PATCH 2/2 trace_workqueues: fix empty line's output
Empty lines separate cpus stat. After previous fix(trace_stat: keep original order) applied, the empty lines are displayed at incorrect position.
Signed-off-by Lai Jiangshan <[email protected]>
---
kernel/trace/trace_workqueue.c +6 -6
@@ -196,6 +196,11 @@ static int workqueue_stat_show(struct seq_file *s, void *p)struct pid *pid;struct task_struct *tsk; +spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); +if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) +seq_printf (s,"\n" ); +spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); + pid =find_get_pid (cws->pid);if (pid) { tsk =get_pid_task (pid,PIDTYPE_PID );
@@ -208,18 +213,13 @@ static int workqueue_stat_show(struct seq_file *s, void *p)put_pid (pid); } -spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) -seq_printf (s,"\n" ); -spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); -return 0 ; }static int workqueue_stat_headers (struct seq_file *s) {seq_printf (s,"# CPU INSERTED EXECUTED NAME\n" ); -seq_printf (s,"# | | | |\n\n" ); +seq_printf (s,"# | | | |\n" );return 0 ; }
Quoted 35 lines · Lai Jiangshan
Empty lines separate cpus stat. After previous
fix(trace_stat: keep original order)applied, the empty lines are displayed at incorrect position.Signed-off-by Lai Jiangshan <[email protected]>---
kernel/trace/trace_workqueue.c +5
-5@@ -196,6 +196,11 @@ static int workqueue_stat_show(struct seq_file *s, void *p)struct pid *pid;struct task_struct *tsk; +spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); +if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) +seq_printf (s,"\n" ); +spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); + pid =find_get_pid (cws->pid);if (pid) { tsk =get_pid_task (pid,PIDTYPE_PID );@@ -208,18 +213,13 @@ static int workqueue_stat_show(struct seq_file *s, void *p)put_pid (pid); } -spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) -seq_printf (s,"\n" ); -spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); -return 0 ;
kernel/trace/trace_workqueue.c static int workqueue_stat_show(struct seq_file *s, void *p) · line 225
Quoted 10 lines
kernel/trace/trace_workqueue.c +1
-1}static int workqueue_stat_headers (struct seq_file *s) {seq_printf (s,"# CPU INSERTED EXECUTED NAME\n" ); -seq_printf (s,"# | | | |\n\n" ); +seq_printf (s,"# | | | |\n" );return 0 ; }
Looks good.
Commit-ID: 2f63b840bc8a816ac879ee773b035cf3e433fae4 Gitweb: http://git.kernel.org/tip/2f63b840bc8a816ac879ee773b035cf3e433fae4 Author: Lai Jiangshan <[email protected]> AuthorDate: Wed, 25 Mar 2009 16:59:18 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 25 Mar 2009 18:32:35 +0100
trace_workqueues: fix empty line's output
Empty lines separate cpus stat. After previous fix(trace_stat: keep original order) applied, the empty lines are displayed at incorrect position.
Signed-off-by Lai Jiangshan <[email protected]>
Acked-by Steven Rostedt <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/trace/trace_workqueue.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
kernel/trace/trace_workqueue.c +6 -6
@@ -196,6 +196,11 @@ static int workqueue_stat_show(struct seq_file *s, void *p)struct pid *pid;struct task_struct *tsk; +spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); +if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) +seq_printf (s,"\n" ); +spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); + pid =find_get_pid (cws->pid);if (pid) { tsk =get_pid_task (pid,PIDTYPE_PID );
@@ -208,18 +213,13 @@ static int workqueue_stat_show(struct seq_file *s, void *p)put_pid (pid); } -spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) -seq_printf (s,"\n" ); -spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); -return 0 ; }static int workqueue_stat_headers (struct seq_file *s) {seq_printf (s,"# CPU INSERTED EXECUTED NAME\n" ); -seq_printf (s,"# | | | |\n\n" ); +seq_printf (s,"# | | | |\n" );return 0 ; }