Fix /proc/softirqs file formatting

PATCH RESEND In review Davidlohr Bueso 2 participants 3 messages Jul 30, 2010 – Aug 6, 2010

Subsystems (2)

VFS Proc filesystem

lore

Share & tools

lore

Davidlohr Bueso

author

2010-07-30 19:06 UTC #0 lore raw

PATCH RESEND 1/1 Fix /proc/softirqs file formatting

Hi,

The length of the BLOCK_IPOLL string is making it's value be printed too far to the right. This patch fixes this and makes the output a bit neater.

Currently:
CPU0
HI: 0
TIMER: 599792
NET_TX: 2
NET_RX: 6
BLOCK: 80807
BLOCK_IOPOLL: 0
TASKLET: 20012
SCHED: 0
HRTIMER: 63

     RCU:     619279

With patch:

                    CPU0
          HI:          0
       TIMER:     585582
      NET_TX:          2
      NET_RX:          6
       BLOCK:      80320
BLOCK_IOPOLL:          0
     TASKLET:      19287
       SCHED:          0
     HRTIMER:         62
         RCU:     604441

Thanks,
Davidlohr

Signed-off-by Davidlohr Bueso <[email protected]>

---
 fs/proc/softirqs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

fs/proc/softirqs.c +2 -2

index 1807c24..3799473 100644
@@ -10,13 +10,13 @@ static int show_softirqs(struct seq_file *p, void *v)
 {
 	int i, j;
 
-	seq_printf(p, "                ");
+	seq_printf(p, "                    ");
 	for_each_possible_cpu(i)
 		seq_printf(p, "CPU%-8d", i);
 	seq_printf(p, "\n");
 
 	for (i = 0; i < NR_SOFTIRQS; i++) {
-		seq_printf(p, "%8s:", softirq_to_name[i]);
+		seq_printf(p, "%12s:", softirq_to_name[i]);
 		for_each_possible_cpu(j)
 			seq_printf(p, " %10u", kstat_softirqs_cpu(i, j));
 		seq_printf(p, "\n");

Signature · 1 line

1.7.0.4

Keika Kobayashi

2010-08-01 23:51 UTC #1 lore raw

Quoted 53 lines · Davidlohr Bueso

Hi,
The length of the BLOCK_IPOLL string is making it's value be printed too far to the right. This patch fixes this and makes the output a bit neater.
Currently:
CPU0
HI: 0
TIMER: 599792
NET_TX: 2
NET_RX: 6
BLOCK: 80807
BLOCK_IOPOLL: 0
TASKLET: 20012
SCHED: 0
HRTIMER: 63
     RCU:     619279
With patch:
                    CPU0
          HI:          0
       TIMER:     585582
      NET_TX:          2
      NET_RX:          6
       BLOCK:      80320
BLOCK_IOPOLL:          0
     TASKLET:      19287
       SCHED:          0
     HRTIMER:         62
         RCU:     604441
Thanks,
Davidlohr
Signed-off-by Davidlohr Bueso <[email protected]>
---
 fs/proc/softirqs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/proc/softirqs.c +1 -1
index 1807c24..3799473 100644
@@ -10,13 +10,13 @@ static int show_softirqs(struct seq_file *p, void *v)
 {
 	int i, j;
 
-	seq_printf(p, "                ");
+	seq_printf(p, "                    ");

fs/proc/softirqs.c static int show_softirqs(struct seq_file *p, void *v) · line 22

Quoted 10 lines

fs/proc/softirqs.c +1 -1

 	for_each_possible_cpu(i)
 		seq_printf(p, "CPU%-8d", i);
 	seq_printf(p, "\n");
 
 	for (i = 0; i < NR_SOFTIRQS; i++) {
-		seq_printf(p, "%8s:", softirq_to_name[i]);
+		seq_printf(p, "%12s:", softirq_to_name[i]);
 		for_each_possible_cpu(j)
 			seq_printf(p, " %10u", kstat_softirqs_cpu(i, j));
 		seq_printf(p, "\n");

Sorry for late response.

It looks good to me.

// Keika Kobayashi

Davidlohr Bueso

author

2010-08-06 14:52 UTC #2 lore raw

Quoted 67 lines · Keika Kobayashi

Quoted 53 lines · Davidlohr Bueso
Hi,
The length of the BLOCK_IPOLL string is making it's value be printed too far to the right. This patch fixes this and makes the output a bit neater.
Currently:
CPU0
HI: 0
TIMER: 599792
NET_TX: 2
NET_RX: 6
BLOCK: 80807
BLOCK_IOPOLL: 0
TASKLET: 20012
SCHED: 0
HRTIMER: 63
     RCU:     619279
With patch:
                    CPU0
          HI:          0
       TIMER:     585582
      NET_TX:          2
      NET_RX:          6
       BLOCK:      80320
BLOCK_IOPOLL:          0
     TASKLET:      19287
       SCHED:          0
     HRTIMER:         62
         RCU:     604441
Thanks,
Davidlohr
Signed-off-by Davidlohr Bueso <[email protected]>
---
 fs/proc/softirqs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/proc/softirqs.c +1 -1
index 1807c24..3799473 100644
@@ -10,13 +10,13 @@ static int show_softirqs(struct seq_file *p, void *v)
 {
 	int i, j;
 
-	seq_printf(p, "                ");
+	seq_printf(p, "                    ");
fs/proc/softirqs.c static int show_softirqs(struct seq_file *p, void *v) · line 22
Quoted 10 lines
fs/proc/softirqs.c +1 -1
 	for_each_possible_cpu(i)
 		seq_printf(p, "CPU%-8d", i);
 	seq_printf(p, "\n");
 
 	for (i = 0; i < NR_SOFTIRQS; i++) {
-		seq_printf(p, "%8s:", softirq_to_name[i]);
+		seq_printf(p, "%12s:", softirq_to_name[i]);
 		for_each_possible_cpu(j)
 			seq_printf(p, " %10u", kstat_softirqs_cpu(i, j));
 		seq_printf(p, "\n");
Sorry for late response.

Quoted 3 lines

It looks good to me.
// Keika Kobayashi

Then, if no one objects, can we get it added upstream?

Thanks,
Davidlohr