AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf evlist: Destructors should accept NULL

Browse Source 
And do nothing, just like free(), to avoid having to test it in callers,
usually in error paths.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-mexbavy0ft387j5w89t365eu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2016-06-21 18:15:45 -03:00
parent 89c7cb2cad
commit 0b04b3dcdf
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/builtin-kvm.c
View File

@ -1429,8 +1429,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
if (kvm->session) if (kvm->session)
perf_session__delete(kvm->session); perf_session__delete(kvm->session);
kvm->session = NULL; kvm->session = NULL;
if (kvm->evlist) perf_evlist__delete(kvm->evlist);
perf_evlist__delete(kvm->evlist);
return err; return err;
} }

3
tools/perf/tests/event-times.c
View File

@ -200,8 +200,7 @@ static int test_times(int (attach)(struct perf_evlist *),
count.ena, count.run); count.ena, count.run);
out_err: out_err:
if (evlist) perf_evlist__delete(evlist);
perf_evlist__delete(evlist);
return !err ? TEST_OK : TEST_FAIL; return !err ? TEST_OK : TEST_FAIL;
} }

3
tools/perf/tests/parse-no-sample-id-all.c
View File

@ -44,8 +44,7 @@ static int process_events(union perf_event **events, size_t count)
for (i = 0; i < count && !err; i++) for (i = 0; i < count && !err; i++)
err = process_event(&evlist, events[i]); err = process_event(&evlist, events[i]);
if (evlist) perf_evlist__delete(evlist);
perf_evlist__delete(evlist);
return err; return err;
} }

3
tools/perf/util/evlist.c
View File

@ -127,6 +127,9 @@ void perf_evlist__exit(struct perf_evlist *evlist)
void perf_evlist__delete(struct perf_evlist *evlist) void perf_evlist__delete(struct perf_evlist *evlist)
{ {
if (evlist == NULL)
return;
perf_evlist__munmap(evlist); perf_evlist__munmap(evlist);
perf_evlist__close(evlist); perf_evlist__close(evlist);
cpu_map__put(evlist->cpus); cpu_map__put(evlist->cpus);