2010-08-06 17:06:05

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: [tip:perf/core] perf hists: Fixup addr snprintf width on 32 bit arches

Commit-ID: fb89941ea761f53201959cc217a2c73f6fe13855
Gitweb: http://git.kernel.org/tip/fb89941ea761f53201959cc217a2c73f6fe13855
Author: Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 5 Aug 2010 19:17:22 -0300
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 5 Aug 2010 19:38:01 -0300

perf hists: Fixup addr snprintf width on 32 bit arches

By using BITS_PER_LONG/4 as the width specifier.

Cc: Frederic Weisbecker <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/util/sort.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 1c61a4f..b62a553 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -196,7 +196,8 @@ static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,

if (verbose) {
char o = self->ms.map ? dso__symtab_origin(self->ms.map->dso) : '!';
- ret += repsep_snprintf(bf, size, "%#018llx %c ", self->ip, o);
+ ret += repsep_snprintf(bf, size, "%*Lx %c ",
+ BITS_PER_LONG / 4, self->ip, o);
}

ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", self->level);
@@ -204,7 +205,8 @@ static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,
ret += repsep_snprintf(bf + ret, size - ret, "%s",
self->ms.sym->name);
else
- ret += repsep_snprintf(bf + ret, size - ret, "%#016llx", self->ip);
+ ret += repsep_snprintf(bf + ret, size - ret, "%*Lx",
+ BITS_PER_LONG / 4, self->ip);

return ret;
}