lkml.org 
[lkml]   [2019]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 38/73] libperf: Add perf_evlist__poll function
    Date
    Move perf_evlist__poll function under libperf,
    it will be used in following patches. And rename
    the existing perf's function to evlist__poll.

    Link: http://lkml.kernel.org/n/tip-hvilw6n69knpyhdndrslgtdu@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/builtin-record.c | 2 +-
    tools/perf/builtin-top.c | 4 ++--
    tools/perf/builtin-trace.c | 2 +-
    tools/perf/lib/evlist.c | 5 +++++
    tools/perf/lib/include/perf/evlist.h | 1 +
    tools/perf/lib/libperf.map | 1 +
    tools/perf/tests/openat-syscall-tp-fields.c | 2 +-
    tools/perf/tests/perf-record.c | 2 +-
    tools/perf/tests/task-exit.c | 2 +-
    tools/perf/util/evlist.c | 6 +++---
    tools/perf/util/evlist.h | 2 +-
    tools/perf/util/python.c | 2 +-
    12 files changed, 19 insertions(+), 12 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index cb5d750cbbdf..7b12877de27c 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -1610,7 +1610,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
    if (hits == rec->samples) {
    if (done || draining)
    break;
    - err = perf_evlist__poll(rec->evlist, -1);
    + err = evlist__poll(rec->evlist, -1);
    /*
    * Propagate error, only if there's any. Ignore positive
    * number of returned events and interrupt error.
    diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
    index 0942e8d4c93b..fb62e10f4d4f 100644
    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -1304,7 +1304,7 @@ static int __cmd_top(struct perf_top *top)
    }

    /* Wait for a minimal set of events before starting the snapshot */
    - perf_evlist__poll(top->evlist, 100);
    + evlist__poll(top->evlist, 100);

    perf_top__mmap_read(top);

    @@ -1314,7 +1314,7 @@ static int __cmd_top(struct perf_top *top)
    perf_top__mmap_read(top);

    if (opts->overwrite || (hits == top->samples))
    - ret = perf_evlist__poll(top->evlist, 100);
    + ret = evlist__poll(top->evlist, 100);

    if (resize) {
    perf_top__resize(top);
    diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
    index 685935b533f4..55daadb001f6 100644
    --- a/tools/perf/builtin-trace.c
    +++ b/tools/perf/builtin-trace.c
    @@ -3472,7 +3472,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
    if (trace->nr_events == before) {
    int timeout = done ? 100 : -1;

    - if (!draining && perf_evlist__poll(evlist, timeout) > 0) {
    + if (!draining && evlist__poll(evlist, timeout) > 0) {
    if (evlist__filter_pollfd(evlist, POLLERR | POLLHUP | POLLNVAL) == 0)
    draining = true;

    diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c
    index a2c01dcec5ae..160393cb9bed 100644
    --- a/tools/perf/lib/evlist.c
    +++ b/tools/perf/lib/evlist.c
    @@ -274,3 +274,8 @@ int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd,

    return pos;
    }
    +
    +int perf_evlist__poll(struct perf_evlist *evlist, int timeout)
    +{
    + return fdarray__poll(&evlist->pollfd, timeout);
    +}
    diff --git a/tools/perf/lib/include/perf/evlist.h b/tools/perf/lib/include/perf/evlist.h
    index 38365f8f3fba..8a2ce0757ab2 100644
    --- a/tools/perf/lib/include/perf/evlist.h
    +++ b/tools/perf/lib/include/perf/evlist.h
    @@ -31,5 +31,6 @@ LIBPERF_API void perf_evlist__disable(struct perf_evlist *evlist);
    LIBPERF_API void perf_evlist__set_maps(struct perf_evlist *evlist,
    struct perf_cpu_map *cpus,
    struct perf_thread_map *threads);
    +LIBPERF_API int perf_evlist__poll(struct perf_evlist *evlist, int timeout);

    #endif /* __LIBPERF_EVLIST_H */
    diff --git a/tools/perf/lib/libperf.map b/tools/perf/lib/libperf.map
    index 507b4cc4784c..2672f21b4908 100644
    --- a/tools/perf/lib/libperf.map
    +++ b/tools/perf/lib/libperf.map
    @@ -38,6 +38,7 @@ LIBPERF_0.0.1 {
    perf_evlist__remove;
    perf_evlist__next;
    perf_evlist__set_maps;
    + perf_evlist__poll;
    local:
    *;
    };
    diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
    index abf4d4f5e429..a5daf4cf17ac 100644
    --- a/tools/perf/tests/openat-syscall-tp-fields.c
    +++ b/tools/perf/tests/openat-syscall-tp-fields.c
    @@ -126,7 +126,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
    }

    if (nr_events == before)
    - perf_evlist__poll(evlist, 10);
    + evlist__poll(evlist, 10);

    if (++nr_polls > 5) {
    pr_debug("%s: no events!\n", __func__);
    diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
    index 80da5b2c6bdc..1b313da8bce9 100644
    --- a/tools/perf/tests/perf-record.c
    +++ b/tools/perf/tests/perf-record.c
    @@ -286,7 +286,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
    * perf_event_attr.wakeup_events, just PERF_EVENT_SAMPLE does.
    */
    if (total_events == before && false)
    - perf_evlist__poll(evlist, -1);
    + evlist__poll(evlist, -1);

    sleep(1);
    if (++wakeups > 5) {
    diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
    index 81c57a6b627f..e6e8a7a970b6 100644
    --- a/tools/perf/tests/task-exit.c
    +++ b/tools/perf/tests/task-exit.c
    @@ -129,7 +129,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused

    out_init:
    if (!exited || !nr_exit) {
    - perf_evlist__poll(evlist, -1);
    + evlist__poll(evlist, -1);
    goto retry;
    }

    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index 449425d9a033..dcc4accd3180 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -417,9 +417,9 @@ int evlist__filter_pollfd(struct evlist *evlist, short revents_and_mask)
    perf_evlist__munmap_filtered, NULL);
    }

    -int perf_evlist__poll(struct evlist *evlist, int timeout)
    +int evlist__poll(struct evlist *evlist, int timeout)
    {
    - return fdarray__poll(&evlist->core.pollfd, timeout);
    + return perf_evlist__poll(&evlist->core, timeout);
    }

    static void perf_evlist__set_sid_idx(struct evlist *evlist,
    @@ -1735,7 +1735,7 @@ static void *perf_evlist__poll_thread(void *arg)
    draining = true;

    if (!draining)
    - perf_evlist__poll(evlist, 1000);
    + evlist__poll(evlist, 1000);

    for (i = 0; i < evlist->core.nr_mmaps; i++) {
    struct mmap *map = &evlist->mmap[i];
    diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
    index 6c5455cf5829..0042eac7e627 100644
    --- a/tools/perf/util/evlist.h
    +++ b/tools/perf/util/evlist.h
    @@ -116,7 +116,7 @@ perf_evlist__find_tracepoint_by_name(struct evlist *evlist,
    int evlist__add_pollfd(struct evlist *evlist, int fd);
    int evlist__filter_pollfd(struct evlist *evlist, short revents_and_mask);

    -int perf_evlist__poll(struct evlist *evlist, int timeout);
    +int evlist__poll(struct evlist *evlist, int timeout);

    struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id);
    struct evsel *perf_evlist__id2evsel_strict(struct evlist *evlist,
    diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
    index fdc787cfa9f7..48fd93a6a247 100644
    --- a/tools/perf/util/python.c
    +++ b/tools/perf/util/python.c
    @@ -918,7 +918,7 @@ static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist,
    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|i", kwlist, &timeout))
    return NULL;

    - n = perf_evlist__poll(evlist, timeout);
    + n = evlist__poll(evlist, timeout);
    if (n < 0) {
    PyErr_SetFromErrno(PyExc_OSError);
    return NULL;
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-09-13 15:28    [W:5.519 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site