aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-probe.c
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2009-12-15 10:32:25 -0500
committerIngo Molnar <mingo@elte.hu>2009-12-15 14:22:04 -0500
commitd761b08bff0a9b653f6bd248cea50322e7eccb14 (patch)
treeec57220663387ceb65a6e34c78f80c2998ee64e6 /tools/perf/builtin-probe.c
parentaf663d75a64d2cc3f18bdb8a29ff4650b9417c16 (diff)
perf probe: Reject second attempt of adding same-name event
Reject second attempt of adding same-name event. This patch also provides --force option which allows user to add additional probe events on the same-name event. e.g. (the first attempt : success) ./perf probe schedule Added new event: probe:schedule (on schedule+0) (the second attempt : failure) ./perf probe schedule:11 Error: event "schedule" already exists. (Use -f to force duplicates.) Fatal: Can't add new event. (the second attempt with -f : successfully added) ./perf probe -f schedule:11 Added new event: probe:schedule_1 (on schedule+45) Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@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: 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: systemtap <systemtap@sources.redhat.com> Cc: DLE <dle-develop@lists.sourceforge.net> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <20091215153225.17436.15166.stgit@dhcp-100-2-132.bos.redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-probe.c')
-rw-r--r--tools/perf/builtin-probe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index adc0a55acd95..8b4fdaeefa29 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -61,6 +61,7 @@ static struct {
61 char *release; 61 char *release;
62 bool need_dwarf; 62 bool need_dwarf;
63 bool list_events; 63 bool list_events;
64 bool force_add;
64 int nr_probe; 65 int nr_probe;
65 struct probe_point probes[MAX_PROBES]; 66 struct probe_point probes[MAX_PROBES];
66 struct strlist *dellist; 67 struct strlist *dellist;
@@ -192,6 +193,8 @@ static const struct option options[] = {
192#endif 193#endif
193 "\t\t\tkprobe-tracer argument format.)\n", 194 "\t\t\tkprobe-tracer argument format.)\n",
194 opt_add_probe_event), 195 opt_add_probe_event),
196 OPT_BOOLEAN('f', "force", &session.force_add, "forcibly add events"
197 " with existing name"),
195 OPT_END() 198 OPT_END()
196}; 199};
197 200
@@ -294,7 +297,8 @@ end_dwarf:
294 } 297 }
295 298
296 /* Settng up probe points */ 299 /* Settng up probe points */
297 add_trace_kprobe_events(session.probes, session.nr_probe); 300 add_trace_kprobe_events(session.probes, session.nr_probe,
301 session.force_add);
298 return 0; 302 return 0;
299} 303}
300 304