mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

perf probe: Print debug messages using pr_*() 

Use the new pr_{err,warning,debug,etc} printout methods, just
like in the kernel.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1256153646-10097-1-git-send-email-acme@redhat.com>
[ Split this patch out, to keep perf/probes separate. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-10-21 17:34:06 -02:00 committed by Ingo Molnar
parent 4331595650
commit b7cb10e790
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/builtin-probe.c
View File

@ -78,7 +78,7 @@ static int parse_probepoint(const struct option *opt __used,
if (!str) /* The end of probe points */
return 0;
eprintf("probe-definition(%d): %s\n", session.nr_probe, str);
pr_debug("probe-definition(%d): %s\n", session.nr_probe, str);
if (++session.nr_probe == MAX_PROBES)
semantic_error("Too many probes");
@ -103,7 +103,7 @@ static int parse_probepoint(const struct option *opt __used,
die("strndup");
if (++argc == MAX_PROBE_ARGS)
semantic_error("Too many arguments");
eprintf("argv[%d]=%s\n", argc, argv[argc - 1]);
pr_debug("argv[%d]=%s\n", argc, argv[argc - 1]);
}
} while (*str != '\0');
if (argc < 2)
@ -133,7 +133,7 @@ static int parse_probepoint(const struct option *opt __used,
pp->line = atoi(ptr);
if (!pp->file || !pp->line)
semantic_error("Failed to parse line.");
eprintf("file:%s line:%d\n", pp->file, pp->line);
pr_debug("file:%s line:%d\n", pp->file, pp->line);
} else {
/* Function name */
ptr = strchr(arg, '+');
@ -150,8 +150,8 @@ static int parse_probepoint(const struct option *opt __used,
pp->file = strdup(ptr);
}
pp->function = strdup(arg);
eprintf("symbol:%s file:%s offset:%d\n",
pp->function, pp->file, pp->offset);
pr_debug("symbol:%s file:%s offset:%d\n",
pp->function, pp->file, pp->offset);
}
free(argv[1]);
if (pp->file)
@ -175,7 +175,7 @@ static int parse_probepoint(const struct option *opt __used,
session.need_dwarf = 1;
}
eprintf("%d arguments\n", pp->nr_args);
pr_debug("%d arguments\n", pp->nr_args);
return 0;
}
@ -188,7 +188,7 @@ static int open_default_vmlinux(void)
ret = uname(&uts);
if (ret) {
eprintf("uname() failed.\n");
pr_debug("uname() failed.\n");
return -errno;
}
session.release = uts.release;
@ -196,12 +196,12 @@ static int open_default_vmlinux(void)
ret = snprintf(fname, MAX_PATH_LEN,
default_search_path[i], session.release);
if (ret >= MAX_PATH_LEN || ret < 0) {
eprintf("Filename(%d,%s) is too long.\n", i,
pr_debug("Filename(%d,%s) is too long.\n", i,
uts.release);
errno = E2BIG;
return -E2BIG;
}
eprintf("try to open %s\n", fname);
pr_debug("try to open %s\n", fname);
fd = open(fname, O_RDONLY);
if (fd >= 0)
break;
@ -341,7 +341,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
ret = find_probepoint(fd, pp);
if (ret <= 0)
die("No probe point found.\n");
eprintf("probe event %s found\n", session.events[j]);
pr_debug("probe event %s found\n", session.events[j]);
}
close(fd);

12
tools/perf/util/probe-finder.c
View File

@ -136,7 +136,7 @@ static Dwarf_Unsigned die_get_fileno(Dwarf_Die cu_die, const char *fname)
dwarf_dealloc(__dw_debug, srcs, DW_DLA_LIST);
}
if (found)
eprintf("found fno: %d\n", (int)found);
pr_debug("found fno: %d\n", (int)found);
return found;
}
@ -442,7 +442,7 @@ static void find_variable(Dwarf_Die sp_die, struct probe_finder *pf)
return ;
}
eprintf("Searching '%s' variable in context.\n", pf->var);
pr_debug("Searching '%s' variable in context.\n", pf->var);
/* Search child die for local variables and parameters. */
ret = search_die_from_children(sp_die, variable_callback, pf);
if (!ret)
@ -552,7 +552,7 @@ static void find_by_line(Dwarf_Die cu_die, struct probe_finder *pf)
ret = dwarf_lineaddr(lines[i], &addr, &__dw_error);
DIE_IF(ret != DW_DLV_OK);
eprintf("Probe point found: 0x%llx\n", addr);
pr_debug("Probe point found: 0x%llx\n", addr);
pf->addr = addr;
/* Search a real subprogram including this line, */
ret = search_die_from_children(cu_die, probeaddr_callback, pf);
@ -583,8 +583,8 @@ static int probefunc_callback(struct die_link *dlink, void *data)
&pf->inl_offs,
&__dw_error);
DIE_IF(ret != DW_DLV_OK);
eprintf("inline definition offset %lld\n",
pf->inl_offs);
pr_debug("inline definition offset %lld\n",
pf->inl_offs);
return 0;
}
/* Get probe address */
@ -599,7 +599,7 @@ static int probefunc_callback(struct die_link *dlink, void *data)
/* Get probe address */
pf->addr = die_get_entrypc(dlink->die);
pf->addr += pp->offset;
eprintf("found inline addr: 0x%llx\n", pf->addr);
pr_debug("found inline addr: 0x%llx\n", pf->addr);
/* Inlined function. Get a real subprogram */
for (lk = dlink->parent; lk != NULL; lk = lk->parent) {
tag = 0;