[PATCH 0/1] MR3775: server: Remove the fallback epoll() syscalls.

[Brendan Shanks (＠bshanks)]

epoll was added to glibc 2.3.2, from 2003.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3775

[PATCH 1/1] server: Remove the fallback epoll() syscalls.

[Brendan Shanks]

From: Brendan Shanks <bshanks(a)codeweavers.com>

---
 server/fd.c | 41 +----------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/server/fd.c b/server/fd.c
index 0b0e91ebfbb..7cdd329bcbb 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -104,46 +104,7 @@
 #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL_CREATE)
 # include <sys/epoll.h>
 # define USE_EPOLL
-#elif defined(linux) && defined(__i386__) && defined(HAVE_STDINT_H)
-# define USE_EPOLL
-# define EPOLLIN POLLIN
-# define EPOLLOUT POLLOUT
-# define EPOLLERR POLLERR
-# define EPOLLHUP POLLHUP
-# define EPOLL_CTL_ADD 1
-# define EPOLL_CTL_DEL 2
-# define EPOLL_CTL_MOD 3
-
-typedef union epoll_data
-{
-  void *ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-} epoll_data_t;
-
-struct epoll_event
-{
-  uint32_t events;
-  epoll_data_t data;
-};
-
-static inline int epoll_create( int size )
-{
-    return syscall( 254 /*NR_epoll_create*/, size );
-}
-
-static inline int epoll_ctl( int epfd, int op, int fd, const struct epoll_event *event )
-{
-    return syscall( 255 /*NR_epoll_ctl*/, epfd, op, fd, event );
-}
-
-static inline int epoll_wait( int epfd, struct epoll_event *events, int maxevents, int timeout )
-{
-    return syscall( 256 /*NR_epoll_wait*/, epfd, events, maxevents, timeout );
-}
-
-#endif /* linux && __i386__ && HAVE_STDINT_H */
+#endif /* HAVE_SYS_EPOLL_H && HAVE_EPOLL_CREATE */
 
 #if defined(HAVE_PORT_H) && defined(HAVE_PORT_CREATE)
 # include <port.h>
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3775

[PATCH 1/1] server: Remove the fallback epoll() syscalls.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=137177

Your paranoid android.


=== debian11b (64 bit WoW report) ===

ws2_32:
protocol.c:2476: Test succeeded inside todo block: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 0: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 1: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 2: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 3: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 4: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 5: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 12: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 13: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 14: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 15: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 16: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 28: IPv6 address is returned.
protocol.c:2494: Test succeeded inside todo block: Test 29: IPv6 address is returned.