diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-10-16 12:25:01 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-10-17 10:14:15 -0400 |
| commit | 597e48c138632d1f55409dcfa5bee4e1152e7d4f (patch) | |
| tree | 847a5e9a7306b31e474958401914cd4e5d46cc60 /tools/perf/util | |
| parent | 691286b5561aab2e1b00119bc328598c01250548 (diff) | |
perf evsel: Move exit stuff from __delete to __exit
So that when an evsel is embedded into other struct it can free up
resources calling perf_evsel__exit().
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-n1w68pfe9m2vkhm4sqs8y1en@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/evsel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d1ecde0fd56c..786ea557af26 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
| @@ -850,17 +850,17 @@ void perf_evsel__exit(struct perf_evsel *evsel) | |||
| 850 | assert(list_empty(&evsel->node)); | 850 | assert(list_empty(&evsel->node)); |
| 851 | perf_evsel__free_fd(evsel); | 851 | perf_evsel__free_fd(evsel); |
| 852 | perf_evsel__free_id(evsel); | 852 | perf_evsel__free_id(evsel); |
| 853 | close_cgroup(evsel->cgrp); | ||
| 854 | zfree(&evsel->group_name); | ||
| 855 | if (evsel->tp_format) | ||
| 856 | pevent_free_format(evsel->tp_format); | ||
| 857 | zfree(&evsel->name); | ||
| 853 | perf_evsel__object.fini(evsel); | 858 | perf_evsel__object.fini(evsel); |
| 854 | } | 859 | } |
| 855 | 860 | ||
| 856 | void perf_evsel__delete(struct perf_evsel *evsel) | 861 | void perf_evsel__delete(struct perf_evsel *evsel) |
| 857 | { | 862 | { |
| 858 | perf_evsel__exit(evsel); | 863 | perf_evsel__exit(evsel); |
| 859 | close_cgroup(evsel->cgrp); | ||
| 860 | zfree(&evsel->group_name); | ||
| 861 | if (evsel->tp_format) | ||
| 862 | pevent_free_format(evsel->tp_format); | ||
| 863 | zfree(&evsel->name); | ||
| 864 | free(evsel); | 864 | free(evsel); |
| 865 | } | 865 | } |
| 866 | 866 | ||