Messages in this thread | | | Date | Tue, 26 Apr 2016 10:50:56 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH perf/core v4 13/19] perf-probe: Set default kprobe group name if it is not given |
| |
Em Tue, Apr 26, 2016 at 06:04:13PM +0900, Masami Hiramatsu escreveu: > From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > > Set kprobe group name as "probe" if it is not given.
Looks good, applied,
- Arnaldo
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> > --- > 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 d4286bb..934797e 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -2822,9 +2822,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;
| |