lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf_counter tools: Clean up u64 usage

Browse Source 
A build error slipped in:

 builtin-report.c: In function ‘hist_entry__fprintf’:
 builtin-report.c:711: error: format ‘%12d’ expects type ‘int’, but argument 3 has type ‘uint64_t’

Because we got a bit sloppy with those types. uint64_t really sucks,
because there's no printf format for it. So standardize on __u64
instead - for all types that go to or come from the ABI (which is __u64),
or for values that need to be large enough even on 32-bit.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-06-11 14:16:15 +02:00
parent df58ab24bf
commit 729ff5e2aa
6 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/perf/builtin-report.c
View File

@ -146,7 +146,7 @@ static void dsos__fprintf(FILE *fp)
dso__fprintf(pos, fp);
}
static struct symbol *vdso__find_symbol(struct dso *dso, uint64_t ip)
static struct symbol *vdso__find_symbol(struct dso *dso, __u64 ip)
{
return dso__find_symbol(kernel_dso, ip);
}
@ -193,19 +193,19 @@ static int strcommon(const char *pathname)
struct map {
struct list_head node;
uint64_t start;
uint64_t end;
uint64_t pgoff;
uint64_t (*map_ip)(struct map *, uint64_t);
__u64 start;
__u64 end;
__u64 pgoff;
__u64 (*map_ip)(struct map *, __u64);
struct dso *dso;
};
static uint64_t map__map_ip(struct map *map, uint64_t ip)
static __u64 map__map_ip(struct map *map, __u64 ip)
{
return ip - map->start + map->pgoff;
}
static uint64_t vdso__map_ip(struct map *map, uint64_t ip)
static __u64 vdso__map_ip(struct map *map, __u64 ip)
{
return ip;
}
@ -288,7 +288,7 @@ static int map__overlap(struct map *l, struct map *r)
static size_t map__fprintf(struct map *self, FILE *fp)
{
return fprintf(fp, " %"PRIx64"-%"PRIx64" %"PRIx64" %s\n",
return fprintf(fp, " %Lx-%Lx %Lx %s\n",
self->start, self->end, self->pgoff, self->dso->name);
}
@ -412,7 +412,7 @@ static int thread__fork(struct thread *self, struct thread *parent)
return 0;
}
static struct map *thread__find_map(struct thread *self, uint64_t ip)
static struct map *thread__find_map(struct thread *self, __u64 ip)
{
struct map *pos;
@ -453,10 +453,10 @@ struct hist_entry {
struct map *map;
struct dso *dso;
struct symbol *sym;
uint64_t ip;
__u64 ip;
char level;
uint64_t count;
__u64 count;
};
/*
@ -572,7 +572,7 @@ static struct sort_entry sort_dso = {
static int64_t
sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
{
uint64_t ip_l, ip_r;
__u64 ip_l, ip_r;
if (left->sym == right->sym)
return 0;
@ -684,7 +684,7 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
}
static size_t
hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
hist_entry__fprintf(FILE *fp, struct hist_entry *self, __u64 total_samples)
{
struct sort_entry *se;
size_t ret;
@ -708,7 +708,7 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
ret = color_fprintf(fp, color, " %6.2f%%",
(self->count * 100.0) / total_samples);
} else
ret = fprintf(fp, "%12d ", self->count);
ret = fprintf(fp, "%12Ld ", self->count);
list_for_each_entry(se, &hist_entry__sort_list, list) {
fprintf(fp, " ");
@ -726,7 +726,7 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
static int
hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
struct symbol *sym, uint64_t ip, char level, uint64_t count)
struct symbol *sym, __u64 ip, char level, __u64 count)
{
struct rb_node **p = &hist.rb_node;
struct rb_node *parent = NULL;
@ -873,7 +873,7 @@ static void output__resort(void)
}
}
static size_t output__fprintf(FILE *fp, uint64_t total_samples)
static size_t output__fprintf(FILE *fp, __u64 total_samples)
{
struct hist_entry *pos;
struct sort_entry *se;
@ -941,8 +941,8 @@ process_overflow_event(event_t *event, unsigned long offset, unsigned long head)
int show = 0;
struct dso *dso = NULL;
struct thread *thread = threads__findnew(event->ip.pid);
uint64_t ip = event->ip.ip;
uint64_t period = 1;
__u64 ip = event->ip.ip;
__u64 period = 1;
struct map *map = NULL;
if (event->header.type & PERF_SAMPLE_PERIOD)