Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29a9f66d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Adjust some verbosity levels 



Not to pollute too much 'perf annotate' debugging sessions.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1265223128-11786-7-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6122e4e4

tools/perf/builtin-annotate.c

+12 −21
Original line number Diff line number Diff line
@@ -97,9 +97,7 @@ static void hist_hit(struct hist_entry *he, u64 ip) 
	sym_size = sym->end - sym->start;

	offset = ip - sym->start;



	if (verbose)

		fprintf(stderr, "%s: ip=%Lx\n", __func__,

			he->map->unmap_ip(he->map, ip));

	pr_debug3("%s: ip=%#Lx\n", __func__, he->map->unmap_ip(he->map, ip));



	if (offset >= sym_size)

		return;
@@ -108,12 +106,8 @@ static void hist_hit(struct hist_entry *he, u64 ip) 
	h->sum++;

	h->ip[offset]++;



	if (verbose >= 3)

		printf("%p %s: count++ [ip: %p, %08Lx] => %Ld\n",

			(void *)(unsigned long)he->sym->start,

			he->sym->name,

			(void *)(unsigned long)ip, ip - he->sym->start,

			h->ip[offset]);

	pr_debug3("%#Lx %s: count++ [ip: %#Lx, %#Lx] => %Ld\n", he->sym->start,

		  he->sym->name, ip, ip - he->sym->start, h->ip[offset]);

}



static int perf_session__add_hist_entry(struct perf_session *self,
@@ -136,13 +130,13 @@ static int process_sample_event(event_t *event, struct perf_session *session) 
		    event->ip.pid, event->ip.ip);



	if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {

		fprintf(stderr, "problem processing %d event, skipping it.\n",

		pr_warning("problem processing %d event, skipping it.\n",

			   event->header.type);

		return -1;

	}



	if (!al.filtered && perf_session__add_hist_entry(session, &al, 1)) {

		fprintf(stderr, "problem incrementing symbol count, "

		pr_warning("problem incrementing symbol count, "

			   "skipping event\n");

		return -1;

	}
@@ -378,10 +372,8 @@ static void annotate_sym(struct hist_entry *he) 
	if (!filename)

		return;



	if (verbose)

		fprintf(stderr, "%s: filename=%s, sym=%s, start=%Lx, end=%Lx\n",

			__func__, filename, sym->name,

			map->unmap_ip(map, sym->start),

	pr_debug("%s: filename=%s, sym=%s, start=%#Lx, end=%#Lx\n", __func__,

		 filename, sym->name, map->unmap_ip(map, sym->start),

		 map->unmap_ip(map, sym->end));



	if (full_paths)
@@ -542,9 +534,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) 
	setup_pager();



	if (field_sep && *field_sep == '.') {

		fputs("'.' is the only non valid --field-separator argument\n",

				stderr);

		exit(129);

		pr_err("'.' is the only non valid --field-separator argument\n");

		return -1;

	}



	return __cmd_annotate();

tools/perf/util/include/linux/kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -101,5 +101,6 @@ simple_strtoul(const char *nptr, char **endptr, int base) 
	eprintf(n, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug2(fmt, ...) pr_debugN(2, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug3(fmt, ...) pr_debugN(3, pr_fmt(fmt), ##__VA_ARGS__)

#define pr_debug4(fmt, ...) pr_debugN(4, pr_fmt(fmt), ##__VA_ARGS__)



#endif

tools/perf/util/symbol.c

+5 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct symbol *symbol__new(u64 start, u64 len, const char *name) 
	self->start = start;

	self->end   = len ? start + len - 1 : start;



	pr_debug3("%s: %s %#Lx-%#Lx\n", __func__, name, start, self->end);

	pr_debug4("%s: %s %#Lx-%#Lx\n", __func__, name, start, self->end);



	memcpy(self->name, name, namelen);
@@ -1024,9 +1024,10 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name, 
		}



		if (curr_dso->adjust_symbols) {

			pr_debug2("adjusting symbol: st_value: %Lx sh_addr: "

				  "%Lx sh_offset: %Lx\n", (u64)sym.st_value,

				  (u64)shdr.sh_addr, (u64)shdr.sh_offset);

			pr_debug4("%s: adjusting symbol: st_value: %#Lx "

				  "sh_addr: %#Lx sh_offset: %#Lx\n", __func__,

				  (u64)sym.st_value, (u64)shdr.sh_addr,

				  (u64)shdr.sh_offset);

			sym.st_value -= shdr.sh_addr - shdr.sh_offset;

		}

		/*