lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 18 Oct 2014 00:06:37 -0700 From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: hpa@...or.com, jean.pihet@...aro.org, efault@....de, acme@...hat.com, fweisbec@...il.com, tglx@...utronix.de, dsahern@...il.com, peterz@...radead.org, adrian.hunter@...el.com, eranian@...gle.com, dzickus@...hat.com, linux-kernel@...r.kernel.org, mingo@...nel.org, bp@...e.de, namhyung@...nel.org, jolsa@...hat.com, paulus@...ba.org Subject: [tip:perf/urgent] perf evsel: Move exit stuff from __delete to __exit Commit-ID: 597e48c138632d1f55409dcfa5bee4e1152e7d4f Gitweb: http://git.kernel.org/tip/597e48c138632d1f55409dcfa5bee4e1152e7d4f Author: Arnaldo Carvalho de Melo <acme@...hat.com> AuthorDate: Thu, 16 Oct 2014 13:25:01 -0300 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitDate: Fri, 17 Oct 2014 11:14:15 -0300 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@...el.com> Cc: Borislav Petkov <bp@...e.de> Cc: David Ahern <dsahern@...il.com> Cc: Don Zickus <dzickus@...hat.com> Cc: Frederic Weisbecker <fweisbec@...il.com> Cc: Jean Pihet <jean.pihet@...aro.org> Cc: Jiri Olsa <jolsa@...hat.com> Cc: Mike Galbraith <efault@....de> Cc: Namhyung Kim <namhyung@...nel.org> Cc: Paul Mackerras <paulus@...ba.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Stephane Eranian <eranian@...gle.com> Link: http://lkml.kernel.org/n/tip-n1w68pfe9m2vkhm4sqs8y1en@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/util/evsel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d1ecde0..786ea55 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) assert(list_empty(&evsel->node)); perf_evsel__free_fd(evsel); perf_evsel__free_id(evsel); + close_cgroup(evsel->cgrp); + zfree(&evsel->group_name); + if (evsel->tp_format) + pevent_free_format(evsel->tp_format); + zfree(&evsel->name); perf_evsel__object.fini(evsel); } void perf_evsel__delete(struct perf_evsel *evsel) { perf_evsel__exit(evsel); - close_cgroup(evsel->cgrp); - zfree(&evsel->group_name); - if (evsel->tp_format) - pevent_free_format(evsel->tp_format); - zfree(&evsel->name); free(evsel); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists