lkml.org 
[lkml]   [2019]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 047/107] perf evlist: Rename perf_evlist__close() to evlist__close()
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    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>
    ---
    tools/perf/builtin-kvm.c | 2 +-
    tools/perf/builtin-stat.c | 4 ++--
    tools/perf/util/evlist.c | 6 +++---
    tools/perf/util/evlist.h | 2 +-
    4 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
    index 85604d117558..6a0573a9c16b 100644
    --- 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 d28d4d71d9b7..bdfe138f7aed 100644
    --- a/tools/perf/builtin-stat.c
    +++ b/tools/perf/builtin-stat.c
    @@ -613,7 +613,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
    * 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 7d44e05dfaa4..67c288f467f6 100644
    --- 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 f4b3152c879e..47e9d26b6774 100644
    --- 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;

    --
    2.21.0
    \
     
     \ /
      Last update: 2019-07-30 05:09    [W:4.624 / U:1.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site