Re: [PATCH perf/core 19/22] perf: fix hists_evsel to release hists

Arnaldo Carvalho de Melo
2015-12-09T15:12:40Z

Em Wed, Dec 09, 2015 at 11:11:29AM +0900, Masami Hiramatsu escreveu:
> Since hists__init doesn't set the destructor of
> hists_evsel (which is an extended evsel structure),
> when hists_evsel is released, the extended part of
> the hists_evsel is not deleted (note that the
> hists_evsel object itself is freed).

This will help with 'perf report', that doesn't use the
hists->entries_in, top will need to drain that one too, but that can be
done in a follow up patch, after some more thinking, applying this
patch, thanks,

- Arnaldo

> This fixes it to add a destructor for hists__evsel
> and to set it up.
>
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
> tools/perf/util/hist.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index 6e8e0ee..565ea35 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -1567,6 +1567,13 @@ static int hists_evsel__init(struct perf_evsel *evsel)
> return 0;
> }
>
> +static void hists_evsel__exit(struct perf_evsel *evsel)
> +{
> + struct hists *hists = evsel__hists(evsel);
> +
> + hists__delete_entries(hists);
> +}
> +
> /*
> * XXX We probably need a hists_evsel__exit() to free the hist_entries
> * stored in the rbtree...
> @@ -1575,7 +1582,8 @@ static int hists_evsel__init(struct perf_evsel *evsel)
> int hists__init(void)
> {
> int err = perf_evsel__object_config(sizeof(struct hists_evsel),
> - hists_evsel__init, NULL);
> + hists_evsel__init,
> + hists_evsel__exit);
> if (err)
> fputs("FATAL ERROR: Couldn't setup hists class\n", stderr);
>