Skip to content

Commit

Permalink
fs/proc/base.c, kernel/latencytop.c: convert sprintf_symbol() to %ps
Browse files Browse the repository at this point in the history
Use temporary lr for struct latency_record for improved readability and
fewer columns used.  Removed trailing space from output.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Jiri Kosina <trivial@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
JoePerches authored and torvalds committed Jan 13, 2011
1 parent 1bdcd78 commit 34e49d4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 28 deletions.
22 changes: 8 additions & 14 deletions fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,24 +373,18 @@ static int lstats_show_proc(struct seq_file *m, void *v)
return -ESRCH;
seq_puts(m, "Latency Top version : v0.1\n");
for (i = 0; i < 32; i++) {
if (task->latency_record[i].backtrace[0]) {
struct latency_record *lr = &task->latency_record[i];
if (lr->backtrace[0]) {
int q;
seq_printf(m, "%i %li %li ",
task->latency_record[i].count,
task->latency_record[i].time,
task->latency_record[i].max);
seq_printf(m, "%i %li %li",
lr->count, lr->time, lr->max);
for (q = 0; q < LT_BACKTRACEDEPTH; q++) {
char sym[KSYM_SYMBOL_LEN];
char *c;
if (!task->latency_record[i].backtrace[q])
unsigned long bt = lr->backtrace[q];
if (!bt)
break;
if (task->latency_record[i].backtrace[q] == ULONG_MAX)
if (bt == ULONG_MAX)
break;
sprint_symbol(sym, task->latency_record[i].backtrace[q]);
c = strchr(sym, '+');
if (c)
*c = 0;
seq_printf(m, "%s ", sym);
seq_printf(m, " %ps", (void *)bt);
}
seq_printf(m, "\n");
}
Expand Down
23 changes: 9 additions & 14 deletions kernel/latencytop.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,24 +241,19 @@ static int lstats_show(struct seq_file *m, void *v)
seq_puts(m, "Latency Top version : v0.1\n");

for (i = 0; i < MAXLR; i++) {
if (latency_record[i].backtrace[0]) {
struct latency_record *lr = &latency_record[i];

if (lr->backtrace[0]) {
int q;
seq_printf(m, "%i %lu %lu ",
latency_record[i].count,
latency_record[i].time,
latency_record[i].max);
seq_printf(m, "%i %lu %lu",
lr->count, lr->time, lr->max);
for (q = 0; q < LT_BACKTRACEDEPTH; q++) {
char sym[KSYM_SYMBOL_LEN];
char *c;
if (!latency_record[i].backtrace[q])
unsigned long bt = lr->backtrace[q];
if (!bt)
break;
if (latency_record[i].backtrace[q] == ULONG_MAX)
if (bt == ULONG_MAX)
break;
sprint_symbol(sym, latency_record[i].backtrace[q]);
c = strchr(sym, '+');
if (c)
*c = 0;
seq_printf(m, "%s ", sym);
seq_printf(m, " %ps", (void *)bt);
}
seq_printf(m, "\n");
}
Expand Down

0 comments on commit 34e49d4

Please sign in to comment.