lkml.org 
[lkml]   [2009]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/3] tracing/workqueue: cleanup for trace_workqueue.c
1: Make function's order in source same with definition in struct tracer_stat
2: Remove ";" after workqueue_stat_file_release()
3: Remove redundant blank in struct tracer_stat workqueue_stats
4: add "static" prefix for some function and struct

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
---
kernel/trace/trace_workqueue.c | 65 +++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
index 6cee4a8..53fe43e 100644
--- a/kernel/trace/trace_workqueue.c
+++ b/kernel/trace/trace_workqueue.c
@@ -81,7 +81,7 @@ static int wq_file_ref;
* Update record when insert a work into workqueue
* Caller need to hold cpu_workqueue_stats spin_lock
*/
-int do_worklet_enqueue(struct cpu_workqueue_stats *cws,
+static int do_worklet_enqueue(struct cpu_workqueue_stats *cws,
struct work_struct *work)
{
struct workfunc_stats *wfstat;
@@ -422,6 +422,27 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
return 0;
}

+static int workqueue_stat_headers(struct seq_file *s)
+{
+ seq_printf(s,
+ "# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID\n");
+ seq_printf(s,
+ "# | | | | | `-WORKFUNC\n");
+ seq_printf(s,
+ "# | | | | | |\n");
+
+ return 0;
+}
+
+static void workqueue_stat_file_open(void)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&free_wq_lock, flags);
+ wq_file_ref++;
+ spin_unlock_irqrestore(&free_wq_lock, flags);
+}
+
/*
* Here we are sure that we have no more readers on our stat file
* and that further readers will block until we return from this function.
@@ -443,42 +464,20 @@ static void workqueue_stat_file_release(void)
}

spin_unlock_irqrestore(&free_wq_lock, flags);
-};
-
-static void workqueue_stat_file_open(void)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&free_wq_lock, flags);
- wq_file_ref++;
- spin_unlock_irqrestore(&free_wq_lock, flags);
-}
-
- /**/
-static int workqueue_stat_headers(struct seq_file *s)
-{
- seq_printf(s,
- "# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID\n");
- seq_printf(s,
- "# | | | | | `-WORKFUNC\n");
- seq_printf(s,
- "# | | | | | |\n");
-
- return 0;
}

-struct tracer_stat workqueue_stats __read_mostly = {
- .name = "workqueues",
- .stat_start = workqueue_stat_start,
- .stat_next = workqueue_stat_next,
- .stat_show = workqueue_stat_show,
- .stat_headers = workqueue_stat_headers,
- .file_open = workqueue_stat_file_open,
- .file_open = workqueue_stat_file_release,
+static struct tracer_stat workqueue_stats __read_mostly = {
+ .name = "workqueues",
+ .stat_start = workqueue_stat_start,
+ .stat_next = workqueue_stat_next,
+ .stat_show = workqueue_stat_show,
+ .stat_headers = workqueue_stat_headers,
+ .file_open = workqueue_stat_file_open,
+ .file_open = workqueue_stat_file_release,
};


-int __init stat_workqueue_init(void)
+static int __init stat_workqueue_init(void)
{
if (register_stat_tracer(&workqueue_stats)) {
pr_warning("Unable to register workqueue stat tracer\n");
@@ -493,7 +492,7 @@ fs_initcall(stat_workqueue_init);
* Workqueues are created very early, just after pre-smp initcalls.
* So we must register our tracepoints at this stage.
*/
-int __init trace_workqueue_early_init(void)
+static int __init trace_workqueue_early_init(void)
{
int ret, cpu;

--
1.5.5.3


\
 
 \ /
  Last update: 2009-05-26 10:25    [W:0.055 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site