aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2009-12-08 17:02:40 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-09 01:26:50 -0500
commit278498d438781426d8f315b65f7bca023a26fcc0 (patch)
tree7606f302584c2e708efde2e5b2bcb3eac572458a /tools/perf/util
parent6ab8886326a1b9a3a8d164d8174e3c20703a03a2 (diff)
perf probe: Change event list format
Change event list format for user readability. perf probe --list shows event list in "[GROUP:EVENT] EVENT-DEFINITION" format, but this format is different from the output of perf-list, and EVENT-DEFINITION is a bit blunt. This patch changes the format to more user friendly one. Before: [probe:schedule_0] schedule+10 prev cpu After: probe:schedule_0 (on schedule+10 with prev cpu) Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Jim Keniston <jkenisto@us.ibm.com> Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Frank Ch. Eigler <fche@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jason Baron <jbaron@redhat.com> Cc: K.Prasad <prasad@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: systemtap <systemtap@sources.redhat.com> Cc: DLE <dle-develop@lists.sourceforge.net> LKML-Reference: <20091208220240.10142.42916.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/probe-event.c27
1 files changed, 25 insertions, 2 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 88e180449933..a20e38273243 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -379,11 +379,29 @@ static void clear_probe_point(struct probe_point *pp)
379 memset(pp, 0, sizeof(pp)); 379 memset(pp, 0, sizeof(pp));
380} 380}
381 381
382/* Show an event */
383static void show_perf_probe_event(const char *group, const char *event,
384 const char *place, struct probe_point *pp)
385{
386 int i;
387 char buf[128];
388
389 e_snprintf(buf, 128, "%s:%s", group, event);
390 printf(" %-40s (on %s", buf, place);
391
392 if (pp->nr_args > 0) {
393 printf(" with");
394 for (i = 0; i < pp->nr_args; i++)
395 printf(" %s", pp->args[i]);
396 }
397 printf(")\n");
398}
399
382/* List up current perf-probe events */ 400/* List up current perf-probe events */
383void show_perf_probe_events(void) 401void show_perf_probe_events(void)
384{ 402{
385 unsigned int i; 403 unsigned int i;
386 int fd; 404 int fd, nr;
387 char *group, *event; 405 char *group, *event;
388 struct probe_point pp; 406 struct probe_point pp;
389 struct strlist *rawlist; 407 struct strlist *rawlist;
@@ -396,8 +414,13 @@ void show_perf_probe_events(void)
396 for (i = 0; i < strlist__nr_entries(rawlist); i++) { 414 for (i = 0; i < strlist__nr_entries(rawlist); i++) {
397 ent = strlist__entry(rawlist, i); 415 ent = strlist__entry(rawlist, i);
398 parse_trace_kprobe_event(ent->s, &group, &event, &pp); 416 parse_trace_kprobe_event(ent->s, &group, &event, &pp);
417 /* Synthesize only event probe point */
418 nr = pp.nr_args;
419 pp.nr_args = 0;
399 synthesize_perf_probe_event(&pp); 420 synthesize_perf_probe_event(&pp);
400 printf("[%s:%s]\t%s\n", group, event, pp.probes[0]); 421 pp.nr_args = nr;
422 /* Show an event */
423 show_perf_probe_event(group, event, pp.probes[0], &pp);
401 free(group); 424 free(group);
402 free(event); 425 free(event);
403 clear_probe_point(&pp); 426 clear_probe_point(&pp);