diff options
author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-12-08 17:02:47 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-09 01:26:51 -0500 |
commit | a9b495b0d35859971d6896293f6d0a0d880c7dfb (patch) | |
tree | 61bf1d42c54fedab2038897b34ef3c648418bdb3 | |
parent | 278498d438781426d8f315b65f7bca023a26fcc0 (diff) |
perf probe: Change probe-added message more user-friendly
Change probe-added message more user-friendly expression and
show usage of new events.
Before:
Added new event: p:probe/schedule_0 schedule+10 prev=%ax cpu=%bx
After:
Added new event:
probe:schedule_1 (on schedule+1 with prev cpu)
You can now use it on all perf tools, such as:
perf record -e probe:schedule_1 -a sleep 1
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: <20091208220247.10142.91642.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | tools/perf/util/probe-event.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index a20e38273243..2c4d3017441b 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
@@ -453,17 +453,13 @@ static struct strlist *get_perf_event_names(int fd) | |||
453 | return sl; | 453 | return sl; |
454 | } | 454 | } |
455 | 455 | ||
456 | static int write_trace_kprobe_event(int fd, const char *buf) | 456 | static void write_trace_kprobe_event(int fd, const char *buf) |
457 | { | 457 | { |
458 | int ret; | 458 | int ret; |
459 | 459 | ||
460 | ret = write(fd, buf, strlen(buf)); | 460 | ret = write(fd, buf, strlen(buf)); |
461 | if (ret <= 0) | 461 | if (ret <= 0) |
462 | die("Failed to create event."); | 462 | die("Failed to create event."); |
463 | else | ||
464 | printf("Added new event: %s\n", buf); | ||
465 | |||
466 | return ret; | ||
467 | } | 463 | } |
468 | 464 | ||
469 | static void get_new_event_name(char *buf, size_t len, const char *base, | 465 | static void get_new_event_name(char *buf, size_t len, const char *base, |
@@ -503,10 +499,19 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes) | |||
503 | PERFPROBE_GROUP, event, | 499 | PERFPROBE_GROUP, event, |
504 | pp->probes[i]); | 500 | pp->probes[i]); |
505 | write_trace_kprobe_event(fd, buf); | 501 | write_trace_kprobe_event(fd, buf); |
502 | printf("Added new event:\n"); | ||
503 | /* Get the first parameter (probe-point) */ | ||
504 | sscanf(pp->probes[i], "%s", buf); | ||
505 | show_perf_probe_event(PERFPROBE_GROUP, event, | ||
506 | buf, pp); | ||
506 | /* Add added event name to namelist */ | 507 | /* Add added event name to namelist */ |
507 | strlist__add(namelist, event); | 508 | strlist__add(namelist, event); |
508 | } | 509 | } |
509 | } | 510 | } |
511 | /* Show how to use the event. */ | ||
512 | printf("\nYou can now use it on all perf tools, such as:\n\n"); | ||
513 | printf("\tperf record -e %s:%s -a sleep 1\n\n", PERFPROBE_GROUP, event); | ||
514 | |||
510 | strlist__delete(namelist); | 515 | strlist__delete(namelist); |
511 | close(fd); | 516 | close(fd); |
512 | } | 517 | } |