Commit-ID: 2a12ec13cc4ca8690ad2690c09bf8bff17c228d9 Gitweb: http://git.kernel.org/tip/2a12ec13cc4ca8690ad2690c09bf8bff17c228d9 Author: Masami Hiramatsu <masami.hiramatsu...@hitachi.com> AuthorDate: Tue, 26 Apr 2016 18:04:13 +0900 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Tue, 26 Apr 2016 13:14:58 -0300
perf probe: Set default kprobe group name if it is not given Set kprobe group name as "probe" if it is not given. Signed-off-by: Masami Hiramatsu <mhira...@kernel.org> Signed-off-by: Masami Hiramatsu <masami.hiramatsu...@hitachi.com> Cc: Ananth N Mavinakayanahalli <ana...@linux.vnet.ibm.com> Cc: Hemant Kumar <hem...@linux.vnet.ibm.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/20160426090413.11891.95640.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/probe-event.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 97b7f8e..0de5d10 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2748,9 +2748,13 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev, { int ret; - if (pev->uprobes && !pev->group) { - /* Replace group name if not given */ - ret = convert_exec_to_group(pev->target, &pev->group); + if (!pev->group) { + /* Set group name if not given */ + if (!pev->uprobes) { + pev->group = strdup(PERFPROBE_GROUP); + ret = pev->group ? 0 : -ENOMEM; + } else + ret = convert_exec_to_group(pev->target, &pev->group); if (ret != 0) { pr_warning("Failed to make a group name.\n"); return ret;
