lkml.org 
[lkml]   [2015]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRE: [RFC/PATCH 1/3] perf probe: Split add_perf_probe_events()
Date
> From: Namhyung Kim [mailto:namhyung@gmail.com] On Behalf Of Namhyung Kim
>
> The add_perf_probe_events() does 3 things:
>
> 1. convert all perf events to trace events
> 2. add all trace events to kernel
> 3. cleanup all trace events
>
> But sometimes we need to do something with the trace events. So split
> the funtion into two, so that it can access intermediate trace events
> via struct __event_package if needed.

Yeah, this is good to me.

Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>

Thanks Namhyung!

>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/util/probe-event.c | 30 ++++++++++++++++++++++++++----
> 1 file changed, 26 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index eb5f18b75402..8eaa03428d72 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2765,9 +2765,10 @@ struct __event_package {
> int ntevs;
> };
>
> -int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)
> +static int __add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
> + struct __event_package **ppkgs)
> {
> - int i, j, ret;
> + int i, ret;
> struct __event_package *pkgs;
>
> ret = 0;
> @@ -2792,7 +2793,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)
> ret = convert_to_probe_trace_events(pkgs[i].pev,
> &pkgs[i].tevs);
> if (ret < 0)
> - goto end;
> + return ret;
> pkgs[i].ntevs = ret;
> }
> /* This just release blacklist only if allocated */
> @@ -2806,7 +2807,19 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)
> if (ret < 0)
> break;
> }
> -end:
> +
> + *ppkgs = pkgs;
> +
> + return 0;
> +}
> +
> +static void cleanup_perf_probe_events(struct __event_package *pkgs, int npevs)
> +{
> + int i, j;
> +
> + if (pkgs == NULL)
> + return;
> +
> /* Loop 3: cleanup and free trace events */
> for (i = 0; i < npevs; i++) {
> for (j = 0; j < pkgs[i].ntevs; j++)
> @@ -2815,6 +2828,15 @@ end:
> }
> free(pkgs);
> exit_symbol_maps();
> +}
> +
> +int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)
> +{
> + int ret;
> + struct __event_package *pkgs = NULL;
> +
> + ret = __add_perf_probe_events(pevs, npevs, &pkgs);
> + cleanup_perf_probe_events(pkgs, npevs);
>
> return ret;
> }
> --
> 2.5.0

\
 
 \ /
  Last update: 2015-09-04 04:21    [W:0.059 / U:4.564 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site