Commit 9cffa8d5 authored by Paul Mackerras's avatar Paul Mackerras Committed by Ingo Molnar
Browse files

perf_counter tools: Define and use our own u64, s64 etc. definitions 



On 64-bit powerpc, __u64 is defined to be unsigned long rather than
unsigned long long.  This causes compiler warnings every time we
print a __u64 value with %Lx.

Rather than changing __u64, we define our own u64 to be unsigned long
long on all architectures, and similarly s64 as signed long long.
For consistency we also define u32, s32, u16, s16, u8 and s8.  These
definitions are put in a new header, types.h, because these definitions
are needed in util/string.h and util/symbol.h.

The main change here is the mechanical change of __[us]{64,32,16,8}
to remove the "__".  The other changes are:

* Create types.h
* Include types.h in perf.h, util/string.h and util/symbol.h
* Add types.h to the LIB_H definition in Makefile
* Added (u64) casts in process_overflow_event() and print_sym_table()
  to kill two remaining warnings.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: benh@kernel.crashing.org
LKML-Reference: <19003.33494.495844.956580@cargo.ozlabs.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b49a9e7e

tools/perf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ LIB_FILE=libperf.a 


LIB_H += ../../include/linux/perf_counter.h

LIB_H += perf.h

LIB_H += types.h

LIB_H += util/list.h

LIB_H += util/rbtree.h

LIB_H += util/levenshtein.h

tools/perf/builtin-annotate.c

+33 −33
Original line number Diff line number Diff line
@@ -50,35 +50,35 @@ static unsigned long mmap_window = 32; 


struct ip_event {

	struct perf_event_header header;

	__u64 ip;

	__u32 pid, tid;

	u64 ip;

	u32 pid, tid;

};



struct mmap_event {

	struct perf_event_header header;

	__u32 pid, tid;

	__u64 start;

	__u64 len;

	__u64 pgoff;

	u32 pid, tid;

	u64 start;

	u64 len;

	u64 pgoff;

	char filename[PATH_MAX];

};



struct comm_event {

	struct perf_event_header header;

	__u32 pid, tid;

	u32 pid, tid;

	char comm[16];

};



struct fork_event {

	struct perf_event_header header;

	__u32 pid, ppid;

	u32 pid, ppid;

};



struct period_event {

	struct perf_event_header header;

	__u64 time;

	__u64 id;

	__u64 sample_period;

	u64 time;

	u64 id;

	u64 sample_period;

};



typedef union event_union {
@@ -158,7 +158,7 @@ static void dsos__fprintf(FILE *fp) 
		dso__fprintf(pos, fp);

}



static struct symbol *vdso__find_symbol(struct dso *dso, __u64 ip)

static struct symbol *vdso__find_symbol(struct dso *dso, u64 ip)

{

	return dso__find_symbol(kernel_dso, ip);

}
@@ -191,19 +191,19 @@ static int load_kernel(void) 


struct map {

	struct list_head node;

	__u64	 start;

	__u64	 end;

	__u64	 pgoff;

	__u64	 (*map_ip)(struct map *, __u64);

	u64	 start;

	u64	 end;

	u64	 pgoff;

	u64	 (*map_ip)(struct map *, u64);

	struct dso	 *dso;

};



static __u64 map__map_ip(struct map *map, __u64 ip)

static u64 map__map_ip(struct map *map, u64 ip)

{

	return ip - map->start + map->pgoff;

}



static __u64 vdso__map_ip(struct map *map, __u64 ip)

static u64 vdso__map_ip(struct map *map, u64 ip)

{

	return ip;

}
@@ -386,7 +386,7 @@ static int thread__fork(struct thread *self, struct thread *parent) 
	return 0;

}



static struct map *thread__find_map(struct thread *self, __u64 ip)

static struct map *thread__find_map(struct thread *self, u64 ip)

{

	struct map *pos;
@@ -427,7 +427,7 @@ struct hist_entry { 
	struct map	 *map;

	struct dso	 *dso;

	struct symbol	 *sym;

	__u64	 ip;

	u64	 ip;

	char		 level;



	uint32_t	 count;
@@ -532,7 +532,7 @@ sort__dso_print(FILE *fp, struct hist_entry *self) 
	if (self->dso)

		return fprintf(fp, "%-25s", self->dso->name);



	return fprintf(fp, "%016llx         ", (__u64)self->ip);

	return fprintf(fp, "%016llx         ", (u64)self->ip);

}



static struct sort_entry sort_dso = {
@@ -546,7 +546,7 @@ static struct sort_entry sort_dso = { 
static int64_t

sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)

{

	__u64 ip_l, ip_r;

	u64 ip_l, ip_r;



	if (left->sym == right->sym)

		return 0;
@@ -563,13 +563,13 @@ sort__sym_print(FILE *fp, struct hist_entry *self) 
	size_t ret = 0;



	if (verbose)

		ret += fprintf(fp, "%#018llx  ", (__u64)self->ip);

		ret += fprintf(fp, "%#018llx  ", (u64)self->ip);



	if (self->sym) {

		ret += fprintf(fp, "[%c] %s",

			self->dso == kernel_dso ? 'k' : '.', self->sym->name);

	} else {

		ret += fprintf(fp, "%#016llx", (__u64)self->ip);

		ret += fprintf(fp, "%#016llx", (u64)self->ip);

	}



	return ret;
@@ -660,7 +660,7 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) 
/*

 * collect histogram counts

 */

static void hist_hit(struct hist_entry *he, __u64 ip)

static void hist_hit(struct hist_entry *he, u64 ip)

{

	unsigned int sym_size, offset;

	struct symbol *sym = he->sym;
@@ -689,7 +689,7 @@ static void hist_hit(struct hist_entry *he, __u64 ip) 


static int

hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,

		struct symbol *sym, __u64 ip, char level)

		struct symbol *sym, u64 ip, char level)

{

	struct rb_node **p = &hist.rb_node;

	struct rb_node *parent = NULL;
@@ -861,7 +861,7 @@ 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);

	__u64 ip = event->ip.ip;

	u64 ip = event->ip.ip;

	struct map *map = NULL;



	dprintf("%p [%p]: PERF_EVENT (IP, %d): %d: %p\n",
@@ -1062,14 +1062,14 @@ static char *get_color(double percent) 
}



static int

parse_line(FILE *file, struct symbol *sym, __u64 start, __u64 len)

parse_line(FILE *file, struct symbol *sym, u64 start, u64 len)

{

	char *line = NULL, *tmp, *tmp2;

	static const char *prev_line;

	static const char *prev_color;

	unsigned int offset;

	size_t line_len;

	__u64 line_ip;

	u64 line_ip;

	int ret;

	char *c;
@@ -1191,7 +1191,7 @@ static void free_source_line(struct symbol *sym, int len) 


/* Get the filename:line for the colored entries */

static void

get_source_line(struct symbol *sym, __u64 start, int len, char *filename)

get_source_line(struct symbol *sym, u64 start, int len, char *filename)

{

	int i;

	char cmd[PATH_MAX * 2];
@@ -1209,7 +1209,7 @@ get_source_line(struct symbol *sym, __u64 start, int len, char *filename) 
	for (i = 0; i < len; i++) {

		char *path = NULL;

		size_t line_len;

		__u64 offset;

		u64 offset;

		FILE *fp;



		sym_ext[i].percent = 100.0 * sym->hist[i] / sym->hist_sum;
@@ -1269,7 +1269,7 @@ static void print_summary(char *filename) 
static void annotate_sym(struct dso *dso, struct symbol *sym)

{

	char *filename = dso->name;

	__u64 start, end, len;

	u64 start, end, len;

	char command[PATH_MAX*2];

	FILE *file;
@@ -1297,7 +1297,7 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) 
	if (verbose >= 2)

		printf("annotating [%p] %30s : [%p] %30s\n", dso, dso->name, sym, sym->name);



	sprintf(command, "objdump --start-address=0x%016Lx --stop-address=0x%016Lx -dS %s", (__u64)start, (__u64)end, filename);

	sprintf(command, "objdump --start-address=0x%016Lx --stop-address=0x%016Lx -dS %s", (u64)start, (u64)end, filename);



	if (verbose >= 3)

		printf("doing: %s\n", command);

tools/perf/builtin-record.c

+10 −10
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static long samples; 
static struct timeval		last_read;

static struct timeval		this_read;



static __u64			bytes_written;

static u64			bytes_written;



static struct pollfd		event_array[MAX_NR_CPUS * MAX_COUNTERS];
@@ -56,18 +56,18 @@ static struct perf_file_header file_header; 


struct mmap_event {

	struct perf_event_header	header;

	__u32				pid;

	__u32				tid;

	__u64				start;

	__u64				len;

	__u64				pgoff;

	u32				pid;

	u32				tid;

	u64				start;

	u64				len;

	u64				pgoff;

	char				filename[PATH_MAX];

};



struct comm_event {

	struct perf_event_header	header;

	__u32				pid;

	__u32				tid;

	u32				pid;

	u32				tid;

	char				comm[16];

};
@@ -238,7 +238,7 @@ static void pid_synthesize_comm_event(pid_t pid, int full) 


	comm_ev.pid = pid;

	comm_ev.header.type = PERF_EVENT_COMM;

	size = ALIGN(size, sizeof(__u64));

	size = ALIGN(size, sizeof(u64));

	comm_ev.header.size = sizeof(comm_ev) - (sizeof(comm_ev.comm) - size);



	if (!full) {
@@ -315,7 +315,7 @@ static void pid_synthesize_mmap_samples(pid_t pid) 
			size = strlen(execname);

			execname[size - 1] = '\0'; /* Remove \n */

			memcpy(mmap_ev.filename, execname, size);

			size = ALIGN(size, sizeof(__u64));

			size = ALIGN(size, sizeof(u64));

			mmap_ev.len -= mmap_ev.start;

			mmap_ev.header.size = (sizeof(mmap_ev) -

					       (sizeof(mmap_ev.filename) - size));

tools/perf/builtin-report.c

+42 −42
Original line number Diff line number Diff line
@@ -54,47 +54,47 @@ static int exclude_other = 1; 


struct ip_event {

	struct perf_event_header header;

	__u64 ip;

	__u32 pid, tid;

	u64 ip;

	u32 pid, tid;

	unsigned char __more_data[];

};



struct ip_callchain {

	__u64 nr;

	__u64 ips[0];

	u64 nr;

	u64 ips[0];

};



struct mmap_event {

	struct perf_event_header header;

	__u32 pid, tid;

	__u64 start;

	__u64 len;

	__u64 pgoff;

	u32 pid, tid;

	u64 start;

	u64 len;

	u64 pgoff;

	char filename[PATH_MAX];

};



struct comm_event {

	struct perf_event_header header;

	__u32 pid, tid;

	u32 pid, tid;

	char comm[16];

};



struct fork_event {

	struct perf_event_header header;

	__u32 pid, ppid;

	u32 pid, ppid;

};



struct period_event {

	struct perf_event_header header;

	__u64 time;

	__u64 id;

	__u64 sample_period;

	u64 time;

	u64 id;

	u64 sample_period;

};



struct lost_event {

	struct perf_event_header header;

	__u64 id;

	__u64 lost;

	u64 id;

	u64 lost;

};



typedef union event_union {
@@ -163,7 +163,7 @@ static void dsos__fprintf(FILE *fp) 
		dso__fprintf(pos, fp);

}



static struct symbol *vdso__find_symbol(struct dso *dso, __u64 ip)

static struct symbol *vdso__find_symbol(struct dso *dso, u64 ip)

{

	return dso__find_symbol(kernel_dso, ip);

}
@@ -210,19 +210,19 @@ static int strcommon(const char *pathname) 


struct map {

	struct list_head node;

	__u64	 start;

	__u64	 end;

	__u64	 pgoff;

	__u64	 (*map_ip)(struct map *, __u64);

	u64	 start;

	u64	 end;

	u64	 pgoff;

	u64	 (*map_ip)(struct map *, u64);

	struct dso	 *dso;

};



static __u64 map__map_ip(struct map *map, __u64 ip)

static u64 map__map_ip(struct map *map, u64 ip)

{

	return ip - map->start + map->pgoff;

}



static __u64 vdso__map_ip(struct map *map, __u64 ip)

static u64 vdso__map_ip(struct map *map, u64 ip)

{

	return ip;

}
@@ -429,7 +429,7 @@ static int thread__fork(struct thread *self, struct thread *parent) 
	return 0;

}



static struct map *thread__find_map(struct thread *self, __u64 ip)

static struct map *thread__find_map(struct thread *self, u64 ip)

{

	struct map *pos;
@@ -471,10 +471,10 @@ struct hist_entry { 
	struct dso	 *dso;

	struct symbol	 *sym;

	struct symbol	 *parent;

	__u64		 ip;

	u64		 ip;

	char		 level;



	__u64		 count;

	u64		 count;

};



/*
@@ -574,7 +574,7 @@ sort__dso_print(FILE *fp, struct hist_entry *self) 
	if (self->dso)

		return fprintf(fp, "%-25s", self->dso->name);



	return fprintf(fp, "%016llx         ", (__u64)self->ip);

	return fprintf(fp, "%016llx         ", (u64)self->ip);

}



static struct sort_entry sort_dso = {
@@ -588,7 +588,7 @@ static struct sort_entry sort_dso = { 
static int64_t

sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)

{

	__u64 ip_l, ip_r;

	u64 ip_l, ip_r;



	if (left->sym == right->sym)

		return 0;
@@ -605,13 +605,13 @@ sort__sym_print(FILE *fp, struct hist_entry *self) 
	size_t ret = 0;



	if (verbose)

		ret += fprintf(fp, "%#018llx  ", (__u64)self->ip);

		ret += fprintf(fp, "%#018llx  ", (u64)self->ip);



	if (self->sym) {

		ret += fprintf(fp, "[%c] %s",

			self->dso == kernel_dso ? 'k' : '.', self->sym->name);

	} else {

		ret += fprintf(fp, "%#016llx", (__u64)self->ip);

		ret += fprintf(fp, "%#016llx", (u64)self->ip);

	}



	return ret;
@@ -745,7 +745,7 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) 
}



static size_t

hist_entry__fprintf(FILE *fp, struct hist_entry *self, __u64 total_samples)

hist_entry__fprintf(FILE *fp, struct hist_entry *self, u64 total_samples)

{

	struct sort_entry *se;

	size_t ret;
@@ -793,7 +793,7 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, __u64 total_samples) 


static struct symbol *

resolve_symbol(struct thread *thread, struct map **mapp,

	       struct dso **dsop, __u64 *ipp)

	       struct dso **dsop, u64 *ipp)

{

	struct dso *dso = dsop ? *dsop : NULL;

	struct map *map = mapp ? *mapp : NULL;
@@ -852,8 +852,8 @@ static int call__match(struct symbol *sym) 


static int

hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,

		struct symbol *sym, __u64 ip, struct ip_callchain *chain,

		char level, __u64 count)

		struct symbol *sym, u64 ip, struct ip_callchain *chain,

		char level, u64 count)

{

	struct rb_node **p = &hist.rb_node;

	struct rb_node *parent = NULL;
@@ -871,11 +871,11 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, 
	int cmp;



	if (sort__has_parent && chain) {

		__u64 context = PERF_CONTEXT_MAX;

		u64 context = PERF_CONTEXT_MAX;

		int i;



		for (i = 0; i < chain->nr; i++) {

			__u64 ip = chain->ips[i];

			u64 ip = chain->ips[i];

			struct dso *dso = NULL;

			struct symbol *sym;
@@ -1032,7 +1032,7 @@ static void output__resort(void) 
	}

}



static size_t output__fprintf(FILE *fp, __u64 total_samples)

static size_t output__fprintf(FILE *fp, u64 total_samples)

{

	struct hist_entry *pos;

	struct sort_entry *se;
@@ -1041,7 +1041,7 @@ static size_t output__fprintf(FILE *fp, __u64 total_samples) 


	fprintf(fp, "\n");

	fprintf(fp, "#\n");

	fprintf(fp, "# (%Ld samples)\n", (__u64)total_samples);

	fprintf(fp, "# (%Ld samples)\n", (u64)total_samples);

	fprintf(fp, "#\n");



	fprintf(fp, "# Overhead");
@@ -1108,7 +1108,7 @@ static int validate_chain(struct ip_callchain *chain, event_t *event) 
	chain_size = event->header.size;

	chain_size -= (unsigned long)&event->ip.__more_data - (unsigned long)event;



	if (chain->nr*sizeof(__u64) > chain_size)

	if (chain->nr*sizeof(u64) > chain_size)

		return -1;



	return 0;
@@ -1121,15 +1121,15 @@ 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);

	__u64 ip = event->ip.ip;

	__u64 period = 1;

	u64 ip = event->ip.ip;

	u64 period = 1;

	struct map *map = NULL;

	void *more_data = event->ip.__more_data;

	struct ip_callchain *chain = NULL;



	if (event->header.type & PERF_SAMPLE_PERIOD) {

		period = *(__u64 *)more_data;

		more_data += sizeof(__u64);

		period = *(u64 *)more_data;

		more_data += sizeof(u64);

	}



	dprintf("%p [%p]: PERF_EVENT (IP, %d): %d: %p period: %Ld\n",

tools/perf/builtin-stat.c

+31 −31
Original line number Diff line number Diff line
@@ -85,29 +85,29 @@ static const unsigned int default_count[] = { 
static int			run_count		=  1;

static int			run_idx			=  0;



static __u64			event_res[MAX_RUN][MAX_COUNTERS][3];

static __u64			event_scaled[MAX_RUN][MAX_COUNTERS];

static u64			event_res[MAX_RUN][MAX_COUNTERS][3];

static u64			event_scaled[MAX_RUN][MAX_COUNTERS];



//static __u64			event_hist[MAX_RUN][MAX_COUNTERS][3];

//static u64			event_hist[MAX_RUN][MAX_COUNTERS][3];





static __u64			runtime_nsecs[MAX_RUN];

static __u64			walltime_nsecs[MAX_RUN];

static __u64			runtime_cycles[MAX_RUN];

static u64			runtime_nsecs[MAX_RUN];

static u64			walltime_nsecs[MAX_RUN];

static u64			runtime_cycles[MAX_RUN];



static __u64			event_res_avg[MAX_COUNTERS][3];

static __u64			event_res_noise[MAX_COUNTERS][3];

static u64			event_res_avg[MAX_COUNTERS][3];

static u64			event_res_noise[MAX_COUNTERS][3];



static __u64			event_scaled_avg[MAX_COUNTERS];

static u64			event_scaled_avg[MAX_COUNTERS];



static __u64			runtime_nsecs_avg;

static __u64			runtime_nsecs_noise;

static u64			runtime_nsecs_avg;

static u64			runtime_nsecs_noise;



static __u64			walltime_nsecs_avg;

static __u64			walltime_nsecs_noise;

static u64			walltime_nsecs_avg;

static u64			walltime_nsecs_noise;



static __u64			runtime_cycles_avg;

static __u64			runtime_cycles_noise;

static u64			runtime_cycles_avg;

static u64			runtime_cycles_noise;



static void create_perf_stat_counter(int counter)

{
@@ -158,7 +158,7 @@ static inline int nsec_counter(int counter) 
 */

static void read_counter(int counter)

{

	__u64 *count, single_count[3];

	u64 *count, single_count[3];

	ssize_t res;

	int cpu, nv;

	int scaled;
@@ -172,8 +172,8 @@ static void read_counter(int counter) 
		if (fd[cpu][counter] < 0)

			continue;



		res = read(fd[cpu][counter], single_count, nv * sizeof(__u64));

		assert(res == nv * sizeof(__u64));

		res = read(fd[cpu][counter], single_count, nv * sizeof(u64));

		assert(res == nv * sizeof(u64));

		close(fd[cpu][counter]);

		fd[cpu][counter] = -1;
@@ -251,14 +251,14 @@ static int run_perf_stat(int argc, const char **argv) 
	return WEXITSTATUS(status);

}



static void print_noise(__u64 *count, __u64 *noise)

static void print_noise(u64 *count, u64 *noise)

{

	if (run_count > 1)

		fprintf(stderr, "   ( +- %7.3f%% )",

			(double)noise[0]/(count[0]+1)*100.0);

}



static void nsec_printout(int counter, __u64 *count, __u64 *noise)

static void nsec_printout(int counter, u64 *count, u64 *noise)

{

	double msecs = (double)count[0] / 1000000;
@@ -274,7 +274,7 @@ static void nsec_printout(int counter, __u64 *count, __u64 *noise) 
	print_noise(count, noise);

}



static void abs_printout(int counter, __u64 *count, __u64 *noise)

static void abs_printout(int counter, u64 *count, u64 *noise)

{

	fprintf(stderr, " %14Ld  %-20s", count[0], event_name(counter));
@@ -298,7 +298,7 @@ static void abs_printout(int counter, __u64 *count, __u64 *noise) 
 */

static void print_counter(int counter)

{

	__u64 *count, *noise;

	u64 *count, *noise;

	int scaled;



	count = event_res_avg[counter];
@@ -326,16 +326,16 @@ static void print_counter(int counter) 
/*

 * normalize_noise noise values down to stddev:

 */

static void normalize_noise(__u64 *val)

static void normalize_noise(u64 *val)

{

	double res;



	res = (double)*val / (run_count * sqrt((double)run_count));



	*val = (__u64)res;

	*val = (u64)res;

}



static void update_avg(const char *name, int idx, __u64 *avg, __u64 *val)

static void update_avg(const char *name, int idx, u64 *avg, u64 *val)

{

	*avg += *val;
@@ -380,19 +380,19 @@ static void calc_avg(void) 


	for (i = 0; i < run_count; i++) {

		runtime_nsecs_noise +=

			abs((__s64)(runtime_nsecs[i] - runtime_nsecs_avg));

			abs((s64)(runtime_nsecs[i] - runtime_nsecs_avg));

		walltime_nsecs_noise +=

			abs((__s64)(walltime_nsecs[i] - walltime_nsecs_avg));

			abs((s64)(walltime_nsecs[i] - walltime_nsecs_avg));

		runtime_cycles_noise +=

			abs((__s64)(runtime_cycles[i] - runtime_cycles_avg));

			abs((s64)(runtime_cycles[i] - runtime_cycles_avg));



		for (j = 0; j < nr_counters; j++) {

			event_res_noise[j][0] +=

				abs((__s64)(event_res[i][j][0] - event_res_avg[j][0]));

				abs((s64)(event_res[i][j][0] - event_res_avg[j][0]));

			event_res_noise[j][1] +=

				abs((__s64)(event_res[i][j][1] - event_res_avg[j][1]));

				abs((s64)(event_res[i][j][1] - event_res_avg[j][1]));

			event_res_noise[j][2] +=

				abs((__s64)(event_res[i][j][2] - event_res_avg[j][2]));

				abs((s64)(event_res[i][j][2] - event_res_avg[j][2]));

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE