File 0003-io-make-use-of-poll-POLLERR-flag.patch of Package ruby2.6

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-io-make-use-of-poll-POLLERR-flag.patch of Package ruby2.6 (Revision fc69d03738d24f390881d6f9a8242751)

Currently displaying revision fc69d03738d24f390881d6f9a8242751 , Show latest

From 192917fd8c85f0833ca6d696c6ab48dfa046dbf5 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 3 Feb 2020 19:51:55 +0100
Subject: [PATCH 3/4] 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          | 14 ++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/ruby/io.h b/include/ruby/io.h
index 7caca17e3b85..fd3e8e02619f 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -47,10 +47,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 af5813e5c261..6ff7e5aa50e7 100644
--- a/thread.c
+++ b/thread.c
@@ -222,8 +222,6 @@ vm_living_thread_num(const rb_vm_t *vm)
 #  endif
 #  if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
 #    define USE_POLL
-     /* FreeBSD does not set POLLOUT when POLLHUP happens */
-#    define POLLERR_SET (POLLHUP | POLLERR)
 #  endif
 #endif
 
@@ -4062,15 +4060,11 @@ 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 POLLERR_SET /* defined for FreeBSD for now */
-#  define POLLERR_SET (0)
-#endif
-
 /*
  * returns a mask of events
  */
@@ -4163,7 +4157,7 @@ rb_wait_for_single_fd(int fd, int events, struct timeval *timeout)
 
     /* all requested events are ready if there is an error */
     if (fds[0].revents & POLLERR_SET)
-	result |= events;
+	result |= events | POLLERR_SET;
 
     return result;
 }
-- 
2.23.0

Places

File 0003-io-make-use-of-poll-POLLERR-flag.patch of Package ruby2.6 (Revision fc69d03738d24f390881d6f9a8242751)

Places