From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Andi Kleen <ak@linux.intel.com>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v12 01/15] tools/libperf: avoid internal moving of fdarray fds
Date: Tue, 21 Jul 2020 09:40:31 -0300 [thread overview]
Message-ID: <20200721124031.GF77866@kernel.org> (raw)
In-Reply-To: <676844f8-55d3-c628-23db-aa163a81519e@linux.intel.com>
Em Fri, Jul 17, 2020 at 09:59:12AM +0300, Alexey Budankov escreveu:
>
> Avoid moving of fds by fdarray__filter() so fds indices returned
> by fdarray__add() can be used for access and processing of
> objects at struct pollfd *entries.
Thanks, applied.
- Arnaldo
> Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/lib/api/fd/array.c | 11 +++++------
> tools/perf/tests/fdarray.c | 20 ++------------------
> 2 files changed, 7 insertions(+), 24 deletions(-)
>
> diff --git a/tools/lib/api/fd/array.c b/tools/lib/api/fd/array.c
> index 58d44d5eee31..89f9a2193c2d 100644
> --- a/tools/lib/api/fd/array.c
> +++ b/tools/lib/api/fd/array.c
> @@ -93,22 +93,21 @@ int fdarray__filter(struct fdarray *fda, short revents,
> return 0;
>
> for (fd = 0; fd < fda->nr; ++fd) {
> + if (!fda->entries[fd].events)
> + continue;
> +
> if (fda->entries[fd].revents & revents) {
> if (entry_destructor)
> entry_destructor(fda, fd, arg);
>
> + fda->entries[fd].revents = fda->entries[fd].events = 0;
> continue;
> }
>
> - if (fd != nr) {
> - fda->entries[nr] = fda->entries[fd];
> - fda->priv[nr] = fda->priv[fd];
> - }
> -
> ++nr;
> }
>
> - return fda->nr = nr;
> + return nr;
> }
>
> int fdarray__poll(struct fdarray *fda, int timeout)
> diff --git a/tools/perf/tests/fdarray.c b/tools/perf/tests/fdarray.c
> index c7c81c4a5b2b..d0c8a05aab2f 100644
> --- a/tools/perf/tests/fdarray.c
> +++ b/tools/perf/tests/fdarray.c
> @@ -12,6 +12,7 @@ static void fdarray__init_revents(struct fdarray *fda, short revents)
>
> for (fd = 0; fd < fda->nr; ++fd) {
> fda->entries[fd].fd = fda->nr - fd;
> + fda->entries[fd].events = revents;
> fda->entries[fd].revents = revents;
> }
> }
> @@ -29,7 +30,7 @@ static int fdarray__fprintf_prefix(struct fdarray *fda, const char *prefix, FILE
>
> int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_unused)
> {
> - int nr_fds, expected_fd[2], fd, err = TEST_FAIL;
> + int nr_fds, err = TEST_FAIL;
> struct fdarray *fda = fdarray__new(5, 5);
>
> if (fda == NULL) {
> @@ -55,7 +56,6 @@ int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_
>
> fdarray__init_revents(fda, POLLHUP);
> fda->entries[2].revents = POLLIN;
> - expected_fd[0] = fda->entries[2].fd;
>
> pr_debug("\nfiltering all but fda->entries[2]:");
> fdarray__fprintf_prefix(fda, "before", stderr);
> @@ -66,17 +66,9 @@ int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_
> goto out_delete;
> }
>
> - if (fda->entries[0].fd != expected_fd[0]) {
> - pr_debug("\nfda->entries[0].fd=%d != %d\n",
> - fda->entries[0].fd, expected_fd[0]);
> - goto out_delete;
> - }
> -
> fdarray__init_revents(fda, POLLHUP);
> fda->entries[0].revents = POLLIN;
> - expected_fd[0] = fda->entries[0].fd;
> fda->entries[3].revents = POLLIN;
> - expected_fd[1] = fda->entries[3].fd;
>
> pr_debug("\nfiltering all but (fda->entries[0], fda->entries[3]):");
> fdarray__fprintf_prefix(fda, "before", stderr);
> @@ -88,14 +80,6 @@ int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_
> goto out_delete;
> }
>
> - for (fd = 0; fd < 2; ++fd) {
> - if (fda->entries[fd].fd != expected_fd[fd]) {
> - pr_debug("\nfda->entries[%d].fd=%d != %d\n", fd,
> - fda->entries[fd].fd, expected_fd[fd]);
> - goto out_delete;
> - }
> - }
> -
> pr_debug("\n");
>
> err = 0;
> --
> 2.24.1
>
>
--
- Arnaldo
next prev parent reply other threads:[~2020-07-21 12:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 6:45 [PATCH v12 00/15] perf: support enable and disable commands in stat and record modes Alexey Budankov
2020-07-17 6:59 ` [PATCH v12 01/15] tools/libperf: avoid internal moving of fdarray fds Alexey Budankov
2020-07-21 12:40 ` Arnaldo Carvalho de Melo [this message]
2020-07-17 6:59 ` [PATCH v12 02/15] tools/libperf: add flags to fdarray fds objects Alexey Budankov
2020-07-21 12:53 ` Arnaldo Carvalho de Melo
2020-07-17 7:00 ` [PATCH v12 03/15] tools/libperf: avoid counting of nonfilterable fdarray fds Alexey Budankov
2020-07-21 19:59 ` Arnaldo Carvalho de Melo
2020-07-17 7:00 ` [PATCH v12 04/15] perf evlist: introduce control file descriptors Alexey Budankov
2020-07-17 7:01 ` [PATCH v12 05/15] perf evlist: implement control command handling functions Alexey Budankov
2020-07-22 12:27 ` Arnaldo Carvalho de Melo
2020-07-22 12:34 ` Arnaldo Carvalho de Melo
2020-07-22 12:45 ` Alexey Budankov
2020-07-22 12:41 ` Arnaldo Carvalho de Melo
2020-07-17 7:02 ` [PATCH v12 06/15] perf stat: factor out body of event handling loop for system wide Alexey Budankov
2020-07-17 7:02 ` [PATCH v12 07/15] perf stat: move target check to loop control statement Alexey Budankov
2020-07-17 7:03 ` [PATCH v12 08/15] perf stat: factor out body of event handling loop for fork case Alexey Budankov
2020-07-17 7:04 ` [PATCH v12 09/15] perf stat: factor out event handling loop into dispatch_events() Alexey Budankov
2020-07-17 7:04 ` [PATCH v12 10/15] perf stat: extend -D,--delay option with -1 value Alexey Budankov
2020-07-17 7:05 ` [PATCH v12 11/15] perf stat: implement control commands handling Alexey Budankov
2020-07-22 12:56 ` Arnaldo Carvalho de Melo
2020-07-22 13:18 ` Alexey Budankov
2020-07-17 7:05 ` [PATCH v12 12/15] perf stat: introduce --control fd:ctl-fd[,ack-fd] options Alexey Budankov
2020-07-17 7:07 ` [PATCH v12 13/15] perf record: extend -D,--delay option with -1 value Alexey Budankov
2020-07-17 7:07 ` [PATCH v12 14/15] perf record: implement control commands handling Alexey Budankov
2020-07-17 7:08 ` [PATCH v12 15/15] perf record: introduce --control fd:ctl-fd[,ack-fd] options Alexey Budankov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200721124031.GF77866@kernel.org \
--to=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox