File 0016-thread-dump-fdset-if-rb_fd_select-finished... of Package ruby2.5

Overview Repositories Revisions Requests Users Attributes Meta

File 0016-thread-dump-fdset-if-rb_fd_select-finished-but-no-fd.patch of Package ruby2.5 (Revision 4848867ac1e053a20becac4c4324211c)

Currently displaying revision 4848867ac1e053a20becac4c4324211c , Show latest

From 28347c5b312d82e11102e521935cf5d2f86a8ecd Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: Mon, 24 Feb 2020 21:01:49 +0100
Subject: [PATCH] thread: dump fdset if rb_fd_select finished but no fd
 reported.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 thread.c | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/thread.c b/thread.c
index 3703f8b7e6cc..023dd27f4afe 100644
--- a/thread.c
+++ b/thread.c
@@ -3797,14 +3797,14 @@ pollfdset_add(struct rb_pollfdset *pollfdset, rb_fdset_t *fds, int flags)
 }
 
 static void
-pollfdset_extract(struct rb_pollfdset *pollfdset, rb_fdset_t *fds, int flags)
+pollfdset_extract(struct rb_pollfdset *pollfdset, rb_fdset_t *fds, int flags, int *extracted)
 {
     int i;
 
     rb_fd_zero(fds);
     for (i = 0; i < pollfdset->n_fds; i++)
         if (pollfdset->fds[i].revents & (flags | POLLERR_SET))
-            rb_fd_set(pollfdset->fds[i].fd, fds);
+            rb_fd_set(pollfdset->fds[i].fd, fds), *extracted++;
 }
 
 static bool
@@ -3819,12 +3819,43 @@ pollfdset_badfd(struct rb_pollfdset *pollfdset)
     return false;
 }
 
+static void
+print_pollevents(int events)
+{
+    if (events | POLLIN) fprintf(stderr, " POLLIN"), events &= ~POLLIN;
+    if (events | POLLRDNORM) fprintf(stderr, " POLLRDNORM"), events &= ~POLLRDNORM;
+    if (events | POLLRDBAND) fprintf(stderr, " POLLRDBAND"), events &= ~POLLRDBAND;
+    if (events | POLLOUT) fprintf(stderr, " POLLOUT"), events &= ~POLLOUT;
+    if (events | POLLWRNORM) fprintf(stderr, " POLLWRNORM"), events &= ~POLLWRNORM;
+    if (events | POLLWRBAND) fprintf(stderr, " POLLWRBAND"), events &= ~POLLWRBAND;
+    if (events | POLLPRI) fprintf(stderr, " POLLPRI"), events &= ~POLLPRI;
+    if (events | POLLHUP) fprintf(stderr, " POLLHUP"), events &= ~POLLHUP;
+    if (events | POLLERR) fprintf(stderr, " POLLERR"), events &= ~POLLERR;
+    if (events | POLLNVAL) fprintf(stderr, " POLLNVAL"), events &= ~POLLNVAL;
+    if (events) fprintf(stderr, " 0x%x", events);
+}
+
+static void
+pollfdset_print(struct rb_pollfdset *pollfdset)
+{
+    int i;
+
+    for (i = 0; i < pollfdset->n_fds; i++) {
+        fprintf(stderr, "fd: %i, events:", pollfdset->fds[i].fd);
+        print_pollevents(pollfdset->fds[i].events);
+        fprintf(stderr, ", revents:");
+        print_pollevents(pollfdset->fds[i].revents);
+        fprintf(stderr, "\n");
+    }
+}
+
 int
 rb_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *exceptfds, rb_fdset_t *errorfds, struct timeval *timeout)
 {
     struct rb_pollfdset pollfdset;
     int timeout_ms = timeout ? timeout->tv_sec * 1000 + timeout->tv_usec / 1000 : -1;
     bool badfd;
+    int extracted = 0;
     int ret;
 
     pollfdset_init(&pollfdset);
@@ -3834,10 +3865,12 @@ rb_fd_select(int n, rb_fdset_t *readfds, rb_fdset_t *writefds, rb_fdset_t *excep
     if (errorfds) pollfdset_add(&pollfdset, errorfds, POLLERR_SET);
     ret = poll(pollfdset.fds, pollfdset.n_fds, timeout_ms);
     if (!(badfd = pollfdset_badfd(&pollfdset))) {
-        if (readfds) pollfdset_extract(&pollfdset, readfds, POLLIN_SET);
-        if (writefds) pollfdset_extract(&pollfdset, writefds, POLLOUT_SET);
-        if (exceptfds) pollfdset_extract(&pollfdset, exceptfds, POLLEX_SET);
-        if (errorfds) pollfdset_extract(&pollfdset, errorfds, POLLERR_SET);
+        if (readfds) pollfdset_extract(&pollfdset, readfds, POLLIN_SET, &extracted);
+        if (writefds) pollfdset_extract(&pollfdset, writefds, POLLOUT_SET, &extracted);
+        if (exceptfds) pollfdset_extract(&pollfdset, exceptfds, POLLEX_SET, &extracted);
+        if (errorfds) pollfdset_extract(&pollfdset, errorfds, POLLERR_SET, &extracted);
+        if (!extracted)
+            pollfdset_print(&pollfdset);
     }
     pollfdset_term(&pollfdset);
     if (badfd) rb_exc_raise(rb_syserr_new(EBADF, 0));
-- 
2.23.0

Places

File 0016-thread-dump-fdset-if-rb_fd_select-finished-but-no-fd.patch of Package ruby2.5 (Revision 4848867ac1e053a20becac4c4324211c)

Places