File 0010-io-make-use-of-poll-POLLERR-flag.patch of Package ruby2.5

Overview Repositories Revisions Requests Users Attributes Meta

File 0010-io-make-use-of-poll-POLLERR-flag.patch of Package ruby2.5 (Revision 31a757ed9f944744f83a4abf31b7dca2)

Currently displaying revision 31a757ed9f944744f83a4abf31b7dca2 , Show latest

From 467c09e5394aef8e12bab5e1c183d478260b0b9a Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 3 Feb 2020 19:51:55 +0100
Subject: [PATCH 10/11] io: make use of poll POLLERR flag

Return additional array of fds with error.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 include/ruby/io.h | 2 ++
 thread.c          | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/ruby/io.h b/include/ruby/io.h
index 60d6f6d32ebb..11d2120e0ac8 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -43,10 +43,12 @@ extern "C" {
 #  define RB_WAITFD_IN  POLLIN
 #  define RB_WAITFD_PRI POLLPRI
 #  define RB_WAITFD_OUT POLLOUT
+#  define RB_WAITFD_ERR (POLLHUP|POLLERR)
 #else
 #  define RB_WAITFD_IN  0x001
 #  define RB_WAITFD_PRI 0x002
 #  define RB_WAITFD_OUT 0x004
+#  define RB_WAITFD_ERR 0x008
 #endif
 
 RUBY_SYMBOL_EXPORT_BEGIN
diff --git a/thread.c b/thread.c
index cef62c37e5d1..6b063ef0c86a 100644
--- a/thread.c
+++ b/thread.c
@@ -3907,9 +3907,9 @@ rb_thread_fd_select(int max, rb_fdset_t * read, rb_fdset_t * write, rb_fdset_t *
 
 #ifdef USE_POLL
 
-/* The same with linux kernel. TODO: make platform independent definition. */
-#define POLLIN_SET (POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP | POLLERR)
-#define POLLOUT_SET (POLLWRBAND | POLLWRNORM | POLLOUT | POLLERR)
+#define POLLIN_SET (POLLRDNORM | POLLRDBAND | POLLIN)
+#define POLLOUT_SET (POLLWRBAND | POLLWRNORM | POLLOUT)
+#define POLLERR_SET (POLLHUP | POLLERR)
 #define POLLEX_SET (POLLPRI)
 
 #ifndef HAVE_PPOLL
@@ -4010,6 +4010,9 @@ rb_wait_for_single_fd(int fd, int events, struct timeval *tv)
 	result |= RB_WAITFD_OUT;
     if (fds.revents & POLLEX_SET)
 	result |= RB_WAITFD_PRI;
+    /* all requested events are ready if there is an error */
+    if (fds.revents & POLLERR_SET)
+	result |= events | POLLERR_SET;
 
     return result;
 }
-- 
2.23.0

Places

File 0010-io-make-use-of-poll-POLLERR-flag.patch of Package ruby2.5 (Revision 31a757ed9f944744f83a4abf31b7dca2)

Places