modify poll return values

R/later.R

@@ -274,8 +274,8 @@ later <- function(func, delay = 0, loop = current_loop()) {
 #' @param func A function that takes a single argument, a logical vector that
 #'   indicates which file descriptors are ready (a concatenation of `readfds`,
 #'   `writefds` and `exceptfds`). This may be all `FALSE` if the
-#'   `timeout` argument is non-`Inf`. Invalid file descriptors or those with
-#'   exceptions will be returned as `NA`.
+#'   `timeout` argument is non-`Inf`. Invalid file descriptors and those with
+#'   activity other than the monitored type will be returned as `NA`.
 #' @param readfds Integer vector of file descriptors, or Windows `SOCKET`s to
 #'   monitor for read activity.
 #' @param writefds Integer vector of file descriptors, or Windows `SOCKET`s to

src/fd.cpp

@@ -139,8 +139,14 @@ static int wait_thread(void *arg) {
 
   values = (int *) DATAPTR_RO(CADR(args->callback));
   if (result > 0) {
-    for (int i = 0; i < args->num_fds; i++) {
-      values[i] = pollfds[i].revents & (POLLIN | POLLOUT) ? 1 : pollfds[i].revents & (POLLNVAL | POLLHUP | POLLERR) ? R_NaInt : 0;
+    for (int i = 0; i < args->rfds; i++) {
+      values[i] = pollfds[i].revents & POLLIN ? 1 : pollfds[i].revents & (POLLNVAL | POLLHUP | POLLERR) ? R_NaInt : 0;
+    }
+    for (int i = args->rfds; i < (args->rfds + args->wfds); i++) {
+      values[i] = pollfds[i].revents & POLLOUT ? 1 : pollfds[i].revents & (POLLNVAL | POLLHUP | POLLERR) ? R_NaInt : 0;
+    }
+    for (int i = args->rfds + args->wfds; i < args->num_fds; i++) {
+      values[i] = pollfds[i].revents != 0;
     }
   } else if (result == 0) {
     std::memset(values, 0, args->num_fds * sizeof(int));