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>

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 85604d11755805dd033ef5d98d8f5f6e5a6ce28d..6a0573a9c16b1ab27ac124bda8ad94e3ce33d2bc 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -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;
        }
 

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index d28d4d71d9b7ce03e7b665dd3333563aa16c5371..bdfe138f7aed45f9bcdb6873709b0af8c33e6e6e 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -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);
        }
 

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 7d44e05dfaa4e0a44fd3bb684516567271f4b635..67c288f467f61e838e68be3f8fea861b2b0c2157 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -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;
 }

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index f4b3152c879e2b415fe3b05c254385b6bd50eef6..47e9d26b677431840a3a10b8fbff2c5c9970d063 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -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;