hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/tools/perf/tests/fdarray.c
....@@ -12,6 +12,7 @@
1212
1313 for (fd = 0; fd < fda->nr; ++fd) {
1414 fda->entries[fd].fd = fda->nr - fd;
15
+ fda->entries[fd].events = revents;
1516 fda->entries[fd].revents = revents;
1617 }
1718 }
....@@ -29,7 +30,7 @@
2930
3031 int test__fdarray__filter(struct test *test __maybe_unused, int subtest __maybe_unused)
3132 {
32
- int nr_fds, expected_fd[2], fd, err = TEST_FAIL;
33
+ int nr_fds, err = TEST_FAIL;
3334 struct fdarray *fda = fdarray__new(5, 5);
3435
3536 if (fda == NULL) {
....@@ -55,7 +56,6 @@
5556
5657 fdarray__init_revents(fda, POLLHUP);
5758 fda->entries[2].revents = POLLIN;
58
- expected_fd[0] = fda->entries[2].fd;
5959
6060 pr_debug("\nfiltering all but fda->entries[2]:");
6161 fdarray__fprintf_prefix(fda, "before", stderr);
....@@ -66,17 +66,9 @@
6666 goto out_delete;
6767 }
6868
69
- if (fda->entries[0].fd != expected_fd[0]) {
70
- pr_debug("\nfda->entries[0].fd=%d != %d\n",
71
- fda->entries[0].fd, expected_fd[0]);
72
- goto out_delete;
73
- }
74
-
7569 fdarray__init_revents(fda, POLLHUP);
7670 fda->entries[0].revents = POLLIN;
77
- expected_fd[0] = fda->entries[0].fd;
7871 fda->entries[3].revents = POLLIN;
79
- expected_fd[1] = fda->entries[3].fd;
8072
8173 pr_debug("\nfiltering all but (fda->entries[0], fda->entries[3]):");
8274 fdarray__fprintf_prefix(fda, "before", stderr);
....@@ -86,14 +78,6 @@
8678 pr_debug("\nfdarray__filter()=%d != 2, should have left just two events",
8779 nr_fds);
8880 goto out_delete;
89
- }
90
-
91
- for (fd = 0; fd < 2; ++fd) {
92
- if (fda->entries[fd].fd != expected_fd[fd]) {
93
- pr_debug("\nfda->entries[%d].fd=%d != %d\n", fd,
94
- fda->entries[fd].fd, expected_fd[fd]);
95
- goto out_delete;
96
- }
9781 }
9882
9983 pr_debug("\n");
....@@ -128,7 +112,7 @@
128112 }
129113
130114 #define FDA_ADD(_idx, _fd, _revents, _nr) \
131
- if (fdarray__add(fda, _fd, _revents) < 0) { \
115
+ if (fdarray__add(fda, _fd, _revents, fdarray_flag__default) < 0) { \
132116 pr_debug("\n%d: fdarray__add(fda, %d, %d) failed!", \
133117 __LINE__,_fd, _revents); \
134118 goto out_delete; \