From 03bf6b90879bb6e5f0fab05a61a843bb437dd30a Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Thu, 28 Jul 2022 19:22:48 +0200 Subject: Revert "Adding a generic cork mechanism for events" This reverts commit 6e841b3153565632b6753f6b1fe74850c37f2808. --- sysdep/unix/io-loop.c | 2 +- sysdep/unix/io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sysdep') diff --git a/sysdep/unix/io-loop.c b/sysdep/unix/io-loop.c index c7cf4ad2..275d38a0 100644 --- a/sysdep/unix/io-loop.c +++ b/sysdep/unix/io-loop.c @@ -205,7 +205,7 @@ sk_stop(sock *s) } static inline uint sk_want_events(sock *s) -{ return ((s->rx_hook && !ev_corked(s->cork)) ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); } +{ return (s->rx_hook ? POLLIN : 0) | ((s->ttx != s->tpos) ? POLLOUT : 0); } /* FIXME: this should be called from sock code diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index dd385c80..c91f2856 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -2234,7 +2234,7 @@ io_loop(void) { pfd[nfds] = (struct pollfd) { .fd = -1 }; /* everything other set to 0 by this */ s = SKIP_BACK(sock, n, n); - if (s->rx_hook && !ev_corked(s->cork)) + if (s->rx_hook) { pfd[nfds].fd = s->fd; pfd[nfds].events |= POLLIN; -- cgit v1.2.3