lkml.org 
[lkml]   [2012]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 02/10] perf, tool: Fix pmu object initialization
Em Wed, Jul 04, 2012 at 12:00:40AM +0200, Jiri Olsa escreveu:
> The internal pmu list was never used. With each perf_pmu__find() call
> the pmu structure was created new by parsing sysfs. Beside this it
> caused memory leaks. We now keep all pmus by adding them to the list.
>
> Also, pmu_lookup() should return pmus that do not expose the format
> specifier in sysfs.
>
> We need a valid internal pmu list in a later patch to iterate over all
> pmus that exist in the system.
>
> Signed-off-by: Robert Richter <robert.richter@amd.com>
> [ added same treatment for 'event' sysfs group attribute ]

The original patch from Robert is already in my perf/core branch, please
resubmit with just your additional code.

- Arnaldo

> Signed-off-by: Jiri Olsa <jolsa@redhat.com>
> ---
> tools/perf/util/pmu.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 74d0948e..f1f83e6 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -72,7 +72,7 @@ static int pmu_format(char *name, struct list_head *format)
> "%s/bus/event_source/devices/%s/format", sysfs, name);
>
> if (stat(path, &st) < 0)
> - return -1;
> + return 0; /* no error if 'format' does not exist */
>
> if (pmu_format_parse(path, format))
> return -1;
> @@ -161,7 +161,7 @@ static int pmu_aliases(char *name, struct list_head *head)
> "%s/bus/event_source/devices/%s/events", sysfs, name);
>
> if (stat(path, &st) < 0)
> - return -1;
> + return 0; /* no error if 'events' does not exist */
>
> if (pmu_aliases_parse(path, head))
> return -1;
> @@ -237,6 +237,9 @@ static struct perf_pmu *pmu_lookup(char *name)
> if (pmu_format(name, &format))
> return NULL;
>
> + if (pmu_aliases(name, &aliases))
> + return NULL;
> +
> if (pmu_type(name, &type))
> return NULL;
>
> @@ -244,14 +247,13 @@ static struct perf_pmu *pmu_lookup(char *name)
> if (!pmu)
> return NULL;
>
> - pmu_aliases(name, &aliases);
> -
> INIT_LIST_HEAD(&pmu->format);
> INIT_LIST_HEAD(&pmu->aliases);
> list_splice(&format, &pmu->format);
> list_splice(&aliases, &pmu->aliases);
> pmu->name = strdup(name);
> pmu->type = type;
> + list_add_tail(&pmu->list, &pmus);
> return pmu;
> }
>
> --
> 1.7.10.4


\
 
 \ /
  Last update: 2012-07-05 17:01    [W:0.137 / U:23.184 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site