From: Alexey Budankov <alexey.budankov@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
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: [PATCH v11 01/15] tools/libperf: avoid internal moving of fdarray fds
Date: Tue, 14 Jul 2020 12:03:23 +0300 [thread overview]
Message-ID: <35f2832f-3ea8-56d6-b0a9-03623588fc12@linux.intel.com> (raw)
In-Reply-To: <037d737f-0ada-a9f0-9686-f7521ca6fbc3@linux.intel.com>
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.
Signed-off-by: Alexey Budankov <alexey.budankov@linux.intel.com>
---
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
next prev parent reply other threads:[~2020-07-14 9:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 8:37 [PATCH v11 00/15] perf: support enable and disable commands in stat and record modes Alexey Budankov
2020-07-14 9:03 ` Alexey Budankov [this message]
2020-07-14 9:03 ` [PATCH v11 02/15] tools/libperf: add flags to fdarray fds objects Alexey Budankov
2020-07-14 9:04 ` [PATCH v11 03/15] tools/libperf: avoid counting of nonfilterable fdarray fds Alexey Budankov
2020-07-16 8:34 ` [tools/libperf] 8edd7f4133: perf-sanity-tests.Filter_fds_with_revents_mask_in_a_fdarray.fail kernel test robot
2020-07-16 15:20 ` Arnaldo Carvalho de Melo
2020-07-16 16:09 ` Alexey Budankov
2020-07-16 16:50 ` Arnaldo Carvalho de Melo
2020-07-14 9:05 ` [PATCH v11 04/15] perf evlist: introduce control file descriptors Alexey Budankov
2020-07-14 9:05 ` [PATCH v11 05/15] perf evlist: implement control command handling functions Alexey Budankov
2020-07-14 9:06 ` [PATCH v11 06/15] perf stat: factor out body of event handling loop for system wide Alexey Budankov
2020-07-14 9:07 ` [PATCH v11 07/15] perf stat: move target check to loop control statement Alexey Budankov
2020-07-14 9:07 ` [PATCH v11 08/15] perf stat: factor out body of event handling loop for fork case Alexey Budankov
2020-07-14 9:08 ` [PATCH v11 09/15] perf stat: factor out event handling loop into dispatch_events() Alexey Budankov
2020-07-14 9:09 ` [PATCH v11 10/15] perf stat: extend -D,--delay option with -1 value Alexey Budankov
2020-07-14 9:09 ` [PATCH v11 11/15] perf stat: implement control commands handling Alexey Budankov
2020-07-14 9:10 ` [PATCH v11 12/15] perf stat: introduce --control fd:ctl-fd[,ack-fd] options Alexey Budankov
2020-07-14 9:11 ` [PATCH v11 13/15] perf record: extend -D,--delay option with -1 value Alexey Budankov
2020-07-14 9:11 ` [PATCH v11 14/15] perf record: implement control commands handling Alexey Budankov
2020-07-14 9:12 ` [PATCH v11 15/15] perf record: introduce --control fd:ctl-fd[,ack-fd] options Alexey Budankov
2020-07-14 12:05 ` [PATCH v11 00/15] perf: support enable and disable commands in stat and record modes Namhyung Kim
2020-07-14 15:16 ` Arnaldo Carvalho de Melo
2020-07-14 15:53 ` Alexey Budankov
2020-07-14 16:15 ` Jiri Olsa
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=35f2832f-3ea8-56d6-b0a9-03623588fc12@linux.intel.com \
--to=alexey.budankov@linux.intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@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;
as well as URLs for NNTP newsgroup(s).