Messages in this thread Patch in this message | | | Date | Sun, 26 Jun 2016 03:53:57 -0700 | From | tip-bot for Arnaldo Carvalho de Melo <> | Subject | [tip:perf/core] perf tests time-to-tsc: No need to disable an event before deleting it |
| |
Commit-ID: 61b3f66a3f99bb8a6a5145b1c2bd7eb98bf64748 Gitweb: http://git.kernel.org/tip/61b3f66a3f99bb8a6a5145b1c2bd7eb98bf64748 Author: Arnaldo Carvalho de Melo <acme@redhat.com> AuthorDate: Wed, 22 Jun 2016 10:10:52 -0300 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Wed, 22 Jun 2016 10:10:52 -0300
perf tests time-to-tsc: No need to disable an event before deleting it
Because at the destructor we will call close() and that will do the disable. And we destructors can accept NULL, just like free(), so no need to check it.
Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/n/tip-i98mcyfkkjh5qp62dle27ac1@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tools/perf/arch/x86/tests/perf-time-to-tsc.c b/tools/perf/arch/x86/tests/perf-time-to-tsc.c index d4aa567..5c76cc8 100644 --- a/tools/perf/arch/x86/tests/perf-time-to-tsc.c +++ b/tools/perf/arch/x86/tests/perf-time-to-tsc.c @@ -154,10 +154,6 @@ next_event: err = 0; out_err: - if (evlist) { - perf_evlist__disable(evlist); - perf_evlist__delete(evlist); - } - + perf_evlist__delete(evlist); return err; }
| |