redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

perf evlist: Rename perf_evlist__close() to evlist__close() 

Rename perf_evlist__close() to evlist__close(), so we don't have a name
clash when we add perf_evlist__close() in libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-21-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
alistair/sunxi64-5.4-dsi
Jiri Olsa 2019-07-21 13:24:07 +02:00 committed by Arnaldo Carvalho de Melo
parent 474ddc4c46
commit 750b4edeb0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1058,7 +1058,7 @@ static int kvm_live_open_events(struct perf_kvm_stat *kvm)
if (perf_evlist__mmap(evlist, kvm->opts.mmap_pages) < 0) {
ui__error("Failed to mmap the events: %s\n",
str_error_r(errno, sbuf, sizeof(sbuf)));
perf_evlist__close(evlist);
evlist__close(evlist);
goto out;
}

4
tools/perf/builtin-stat.c
View File

@ -613,7 +613,7 @@ try_again:
* later the evsel_list will be closed after.
*/
if (!STAT_RECORD)
perf_evlist__close(evsel_list);
evlist__close(evsel_list);
return WEXITSTATUS(status);
}
@ -2003,7 +2003,7 @@ int cmd_stat(int argc, const char **argv)
perf_session__write_header(perf_stat.session, evsel_list, fd, true);
}
perf_evlist__close(evsel_list);
evlist__close(evsel_list);
perf_session__delete(perf_stat.session);
}

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

@ -140,7 +140,7 @@ void evlist__delete(struct evlist *evlist)
return;
perf_evlist__munmap(evlist);
perf_evlist__close(evlist);
evlist__close(evlist);
cpu_map__put(evlist->cpus);
thread_map__put(evlist->threads);
evlist->cpus = NULL;
@ -1348,7 +1348,7 @@ void perf_evlist__set_selected(struct evlist *evlist,
evlist->selected = evsel;
}
void perf_evlist__close(struct evlist *evlist)
void evlist__close(struct evlist *evlist)
{
struct evsel *evsel;
@ -1412,7 +1412,7 @@ int evlist__open(struct evlist *evlist)
return 0;
out_err:
perf_evlist__close(evlist);
evlist__close(evlist);
errno = -err;
return err;
}

2
tools/perf/util/evlist.h
View File

@ -147,7 +147,7 @@ void perf_evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state sta
void perf_evlist__mmap_consume(struct evlist *evlist, int idx);
int evlist__open(struct evlist *evlist);
void perf_evlist__close(struct evlist *evlist);
void evlist__close(struct evlist *evlist);
struct callchain_param;