Skip to contentSkip to conversation

tracing/workqueue: fix list header and function name format

PATCH In review Zhaolei 2 participants 4 messages May 26, 2009 Tracing

lore
Share & tools
lore

Zhaolei

author
#0 lore raw

PATCH 1/3 tracing/workqueue: fix list header and function name format

Fix list header of workqueue trace,
and use %pf to print the function name only(ignore the offsets).

Before patch:
# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID

 #  |     |        |           |      ` |     -WORKFUNC
 #  |     |        |           |        |          |
     0        1        1     1053     1053   `-flush_async_commits+0x0/0x90

...

After patch:
# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID

 #  |     |        |         |        |      `-WORKFUNC
 #  |     |        |         |        |           |
     0        1        1     1155     1155   `-flush_async_commits

...

---
 kernel/trace/trace_workqueue.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
kernel/trace/trace_workqueue.c +8 -6
index c67be60..6cee4a8 100644
@@ -409,7 +409,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
 			avg_time = 0;
 		}
 
-		seq_printf(s, "  %3d   %6d   %6u   %6llu   %6llu   %c-%pF\n",
+		seq_printf(s, "  %3d   %6d   %6u   %6llu   %6llu   %c-%pf\n",
 			cws->cpu,
 			wfstat->inserted,
 			wfstat->executed,
@@ -457,11 +457,13 @@ static void workqueue_stat_file_open(void)
 		/**/
 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");
+	seq_printf(s,
+		"# CPU INSERTED EXECUTED   MAX us   AVG us   TASKNAME:PID\n");
+	seq_printf(s,
+		"#  |     |        |         |        |      `-WORKFUNC\n");
+	seq_printf(s,
+		"#  |     |        |         |        |           |\n");
+
 	return 0;
 }
 
Signature · 1 line
1.5.5.3
author
#1 lore raw

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

---
 kernel/trace/trace_workqueue.c |   65 +++++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 33 deletions(-)
kernel/trace/trace_workqueue.c +32 -33
index 6cee4a8..53fe43e 100644
@@ -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;
 
Signature · 1 line
1.5.5.3
author
#2 lore raw

PATCH 3/3 tracing/workqueue: make events sort in ascending order

In reply to Zhaolei

Events in workqueue tracer need to be sorted in ascending order to make user clear.
But now it is reversed by "tracing/stat: replace linked list by an rbtree for sorting"(53059c9b67a62a3dc8c80204d3da42b9267ea5a0).
We need to define a custom cmp() callback to make sorting correct.

Before patch:
# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID

 #  |     |        |         |        |      `-WORKFUNC
 #  |     |        |         |        |           |
     0        1        1     1155     1155   `-xprt_autoclose
     0       19       19      864      143   |-xs_udp_connect_worker4

...
0 1 1 4825 4825 |-reg_todo
0 443 515 events/0:5

After patch:
# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID

 #  |     |        |         |        |      `-WORKFUNC
 #  |     |        |         |        |           |

0 443 515 events/0:5
0 1 1 4825 4825 |-reg_todo
...
0 19 19 797 134 |-xs_udp_connect_worker4
0 1 1 8359 8359 `-xprt_autoclose

---
 kernel/trace/trace_workqueue.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
kernel/trace/trace_workqueue.c +7 -0
index 53fe43e..7fa0d23 100644
@@ -383,6 +383,12 @@ static void *workqueue_stat_next(void *prev, int idx)
 	return ret;
 }
 
+/* To make events sort in ascending order */
+static int workqueue_stat_cmp(void *p1, void *p2)
+{
+	return -1;
+}
+
 static int workqueue_stat_show(struct seq_file *s, void *p)
 {
 	struct workfunc_stats *wfstat = p;
@@ -470,6 +476,7 @@ static struct tracer_stat workqueue_stats __read_mostly = {
 	.name		= "workqueues",
 	.stat_start	= workqueue_stat_start,
 	.stat_next	= workqueue_stat_next,
+	.stat_cmp	= workqueue_stat_cmp,
 	.stat_show	= workqueue_stat_show,
 	.stat_headers	= workqueue_stat_headers,
 	.file_open	= workqueue_stat_file_open,
Signature · 1 line
1.5.5.3
#3 lore raw

Re: [PATCH 3/3] tracing/workqueue: make events sort in ascending order

Quoted 5 lines · Zhaolei

Events in workqueue tracer need to be sorted in ascending order to make user clear.
But now it is reversed by "tracing/stat: replace linked list by an rbtree for sorting"(53059c9b67a62a3dc8c80204d3da42b9267ea5a0).
We need to define a custom cmp() callback to make sorting correct.

That's my bad, the reverse sorting subsequent to this patch is an accident so the fix should be done in the stat tracing framework.

I'll fix that.

The other patches for the workqueue tracer look good. I'll apply them and send a pull request to Ingo.

Thanks!

Quoted 54 lines

Before patch:
# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID

 #  |     |        |         |        |      `-WORKFUNC
 #  |     |        |         |        |           |
     0        1        1     1155     1155   `-xprt_autoclose
     0       19       19      864      143   |-xs_udp_connect_worker4

...
0 1 1 4825 4825 |-reg_todo
0 443 515 events/0:5

After patch:
# CPU INSERTED EXECUTED MAX us AVG us TASKNAME:PID

 #  |     |        |         |        |      `-WORKFUNC
 #  |     |        |         |        |           |

0 443 515 events/0:5
0 1 1 4825 4825 |-reg_todo
...
0 19 19 797 134 |-xs_udp_connect_worker4
0 1 1 8359 8359 `-xprt_autoclose

---
 kernel/trace/trace_workqueue.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
kernel/trace/trace_workqueue.c +7 -0
index 53fe43e..7fa0d23 100644
@@ -383,6 +383,12 @@ static void *workqueue_stat_next(void *prev, int idx)
 	return ret;
 }
 
+/* To make events sort in ascending order */
+static int workqueue_stat_cmp(void *p1, void *p2)
+{
+	return -1;
+}
+
 static int workqueue_stat_show(struct seq_file *s, void *p)
 {
 	struct workfunc_stats *wfstat = p;
@@ -470,6 +476,7 @@ static struct tracer_stat workqueue_stats __read_mostly = {
 	.name		= "workqueues",
 	.stat_start	= workqueue_stat_start,
 	.stat_next	= workqueue_stat_next,
+	.stat_cmp	= workqueue_stat_cmp,
 	.stat_show	= workqueue_stat_show,
 	.stat_headers	= workqueue_stat_headers,
 	.file_open	= workqueue_stat_file_open,
Signature · 1 line
1.5.5.3