perf evsel: Rename perf_evsel__new() to evsel__new()

Rename perf_evsel__new() to evsel__new(), so we don't have a name clash
when we add perf_evsel__new() 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-12-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 0f7d1859a2d17e27d2c5fd44301424beb268bd21..c5eb47f4e42ebee61bb160d588cd01e3e2df3285 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2657,7 +2657,7 @@ static struct evsel *perf_evsel__new_pgfault(u64 config)
 
        event_attr_init(&attr);
 
-       evsel = perf_evsel__new(&attr);
+       evsel = evsel__new(&attr);
        if (evsel)
                evsel->handler = trace__pgfault;
 

diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
index 1c7d8adb43d0a72af1ec117184469ce3da2b1dfb..247d3734686efdc2a22f2bcdb3462b1303290d10 100644 (file)
--- a/tools/perf/tests/sw-clock.c
+++ b/tools/perf/tests/sw-clock.c
@@ -49,7 +49,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                return -1;
        }
 
-       evsel = perf_evsel__new(&attr);
+       evsel = evsel__new(&attr);
        if (evsel == NULL) {
                pr_debug("perf_evsel__new\n");
                goto out_delete_evlist;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index de379b63f1ceb136db68b04abd4afe1eefd1c171..c9723c2d57c91cc521254a877a441251dade6242 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -301,7 +301,7 @@ struct evsel *perf_evsel__new_cycles(bool precise)
         * to kick in when we return and before perf_evsel__open() is called.
         */
 new_event:
-       evsel = perf_evsel__new(&attr);
+       evsel = evsel__new(&attr);
        if (evsel == NULL)
                goto out;
 

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 20b4e31b63a901431beefcd6cf3b76dd234c505c..ecea51a918e0ad07be294bdf8657cfe3460da5b2 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -219,7 +219,7 @@ int perf_evsel__object_config(size_t object_size,
 
 struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx);
 
-static inline struct evsel *perf_evsel__new(struct perf_event_attr *attr)
+static inline struct evsel *evsel__new(struct perf_event_attr *attr)
 {
        return perf_evsel__new_idx(attr, 0);
 }

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 29bbfd699226b8cda0b1525e5708dc7abe1c463f..7760ddc4bc18ae744cb54765dd6eeba4da9499d6 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -3583,7 +3583,7 @@ int perf_session__read_header(struct perf_session *session)
                }
 
                tmp = lseek(fd, 0, SEEK_CUR);
-               evsel = perf_evsel__new(&f_attr.attr);
+               evsel = evsel__new(&f_attr.attr);
 
                if (evsel == NULL)
                        goto out_delete_evlist;
@@ -4021,7 +4021,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused,
                        return -ENOMEM;
        }
 
-       evsel = perf_evsel__new(&event->attr.attr);
+       evsel = evsel__new(&event->attr.attr);
        if (evsel == NULL)
                return -ENOMEM;
 

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index cc63367f6e450647e5054802a5ad40a5eb7646fa..40087cf74dd1bb46ce6f7bfe81e422fde0aa4ebd 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2318,7 +2318,7 @@ static bool is_event_supported(u8 type, unsigned config)
        if (tmap == NULL)
                return false;
 
-       evsel = perf_evsel__new(&attr);
+       evsel = evsel__new(&attr);
        if (evsel) {
                open_return = perf_evsel__open(evsel, NULL, tmap);
                ret = open_return >= 0;