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 v8 01/13] tools/libperf: avoid moving of fds at fdarray__filter() call
Date: Wed, 17 Jun 2020 11:35:11 +0300 [thread overview]
Message-ID: <3d36dc7a-4249-096c-7554-80e6d290eac5@linux.intel.com> (raw)
In-Reply-To: <0781a077-aa82-5b4a-273e-c17372a72b93@linux.intel.com>
Skip fds with zeroed revents field from count and avoid fds moving
at fdarray__filter() call so fds indices returned by fdarray__add()
call stay the same and can be used for direct access and processing
of fd revents status field at entries array of struct fdarray object.
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..97843a837370 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].revents)
+ 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-06-17 8:35 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 8:30 [PATCH v8 00/13] perf: support enable and disable commands in stat and record modes Alexey Budankov
2020-06-17 8:35 ` Alexey Budankov [this message]
2020-06-24 17:19 ` [PATCH v8 01/13] tools/libperf: avoid moving of fds at fdarray__filter() call Alexey Budankov
2020-06-25 17:14 ` Jiri Olsa
2020-06-25 19:32 ` Alexey Budankov
2020-06-26 9:37 ` Jiri Olsa
2020-06-26 10:06 ` Alexey Budankov
2020-06-29 15:11 ` Alexey Budankov
2020-06-29 19:17 ` Jiri Olsa
2020-06-17 8:35 ` [PATCH v8 02/13] perf evlist: introduce control file descriptors Alexey Budankov
2020-06-17 8:36 ` [PATCH v8 03/13] perf evlist: implement control command handling functions Alexey Budankov
2020-06-23 14:56 ` Jiri Olsa
2020-06-23 15:03 ` Arnaldo Carvalho de Melo
2020-06-23 15:14 ` Jiri Olsa
2020-06-24 13:35 ` Alexey Budankov
2020-06-23 14:56 ` Jiri Olsa
2020-06-24 13:20 ` Alexey Budankov
2020-06-17 8:37 ` [PATCH v8 04/13] perf stat: factor out body of event handling loop for system wide Alexey Budankov
2020-06-23 14:56 ` Jiri Olsa
2020-06-24 14:27 ` Alexey Budankov
2020-06-25 12:17 ` Jiri Olsa
2020-06-25 16:01 ` Alexey Budankov
2020-06-25 17:13 ` Jiri Olsa
2020-06-25 18:43 ` Alexey Budankov
2020-06-17 8:38 ` [PATCH v8 05/13] perf stat: move target check to loop control statement Alexey Budankov
2020-06-17 8:39 ` [PATCH v8 06/13] perf stat: factor out body of event handling loop for fork case Alexey Budankov
2020-06-17 8:40 ` [PATCH v8 07/13] perf stat: factor out event handling loop into dispatch_events() Alexey Budankov
2020-06-23 14:56 ` Jiri Olsa
2020-06-24 13:27 ` Alexey Budankov
2020-06-17 8:40 ` [PATCH v8 08/13] perf stat: extend -D,--delay option with -1 value Alexey Budankov
2020-06-17 8:41 ` [PATCH v8 09/13] perf stat: implement control commands handling Alexey Budankov
2020-06-23 14:54 ` Jiri Olsa
2020-06-24 14:10 ` Alexey Budankov
2020-06-25 12:14 ` Jiri Olsa
2020-06-25 14:58 ` Alexey Budankov
2020-06-23 14:54 ` Jiri Olsa
2020-06-24 13:39 ` Alexey Budankov
2020-06-25 12:12 ` Jiri Olsa
2020-06-25 14:52 ` Alexey Budankov
2020-06-17 8:42 ` [PATCH v8 10/13] perf stat: introduce --control fd:ctl-fd[,ack-fd] options Alexey Budankov
2020-06-17 8:42 ` [PATCH v8 11/13] perf record: extend -D,--delay option with -1 value Alexey Budankov
2020-06-17 8:43 ` [PATCH v8 12/13] perf record: implement control commands handling Alexey Budankov
2020-06-23 14:54 ` Jiri Olsa
2020-06-24 14:00 ` Alexey Budankov
2020-06-24 14:55 ` Alexey Budankov
2020-06-25 17:07 ` Jiri Olsa
2020-06-17 8:44 ` [PATCH v8 13/13] perf record: introduce --control fd:ctl-fd[,ack-fd] options Alexey Budankov
2020-06-22 3:38 ` [PATCH v8 00/13] perf: support enable and disable commands in stat and record modes Alexey Budankov
2020-06-22 8:55 ` 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=3d36dc7a-4249-096c-7554-80e6d290eac5@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).