osdep: add poll shim for macOS

osdep/polldev.c

@@ -0,0 +1,75 @@
+/*
+ * poll shim that supports device files on macOS.
+ *
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <poll.h>
+#include <sys/select.h>
+#include <stdio.h>
+
+#include "osdep/polldev.h"
+
+int polldev(struct pollfd fds[], nfds_t nfds, int timeout) {
+#ifdef __APPLE__
+    int maxfd = 0;
+    fd_set readfds, writefds, errorfds;
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
+    FD_ZERO(&errorfds);
+    for (size_t i = 0; i < nfds; ++i) {
+        struct pollfd *fd = &fds[i];
+        if (fd->fd > maxfd) {
+            maxfd = fd->fd;
+        }
+        if ((fd->events & POLLIN)) {
+            FD_SET(fd->fd, &readfds);
+        }
+        if ((fd->events & POLLOUT)) {
+            FD_SET(fd->fd, &writefds);
+        }
+        if ((fd->events & POLLERR)) {
+            FD_SET(fd->fd, &errorfds);
+        }
+    }
+    struct timeval _timeout = {
+        .tv_sec = timeout / 1000,
+        .tv_usec = (timeout % 1000) * 1000
+    };
+    int n = select(maxfd + 1, &readfds, &writefds, &errorfds,
+        timeout != -1 ? &_timeout : NULL);
+    if (n < 0) {
+        return n;
+    }
+    for (size_t i = 0; i < nfds; ++i) {
+        struct pollfd *fd = &fds[i];
+        fd->revents = 0;
+        if (FD_ISSET(fd->fd, &readfds)) {
+            fd->revents |= POLLIN;
+        }
+        if (FD_ISSET(fd->fd, &writefds)) {
+            fd->revents |= POLLOUT;
+        }
+        if (FD_ISSET(fd->fd, &errorfds)) {
+            fd->revents |= POLLERR;
+        }
+    }
+    return n;
+#else
+    return poll(fds, nfds, timeout);
+#endif
+}

osdep/polldev.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <poll.h>
+
+// Behaves like poll(3) but works for device files on macOS.
+// Only supports POLLIN, POLLOUT, and POLLERR.
+int polldev(struct pollfd fds[], nfds_t nfds, int timeout);

osdep/terminal-unix.c

@@ -25,16 +25,15 @@
 #include <signal.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <sys/select.h>
 #include <pthread.h>
-#include <time.h>
 #include <assert.h>
 
 #include <termios.h>
 #include <unistd.h>
 
 #include "osdep/io.h"
 #include "osdep/threads.h"
+#include "osdep/polldev.h"
 
 #include "common/common.h"
 #include "misc/bstr.h"
@@ -387,22 +386,17 @@ static void *terminal_thread(void *ptr)
 {
     mpthread_set_name("terminal");
     bool stdin_ok = read_terminal; // if false, we still wait for SIGTERM
-    fd_set readfds;
-    int max = death_pipe[0] > tty_in ? death_pipe[0] : tty_in;
     while (1) {
-        FD_ZERO(&readfds);
-        FD_SET(death_pipe[0], &readfds);
-        FD_SET(tty_in, &readfds);
         getch2_poll();
-        int s = select(max + 1, &readfds, NULL, NULL, NULL);
-        if (s == -1) {
+        struct pollfd fds[2] = {
+            { .events = POLLIN, .fd = death_pipe[0] },
+            { .events = POLLIN, .fd = tty_in }
+        };
+        polldev(fds, stdin_ok ? 2 : 1, -1);
+        if (fds[0].revents)
             break;
-        } else if (s != 0) {
-            if (FD_ISSET(death_pipe[0], &readfds))
-                break;
-            if (stdin_ok && FD_ISSET(tty_in, &readfds))
-                stdin_ok = getch2(input_ctx);
-        }
+        if (fds[1].revents)
+            getch2(input_ctx);
     }
     char c;
     bool quit = read(death_pipe[0], &c, 1) == 1 && c == 1;

wscript_build.py

@@ -476,6 +476,7 @@ def build(ctx):
         ( "osdep/timer.c" ),
         ( timer_c ),
         ( "osdep/threads.c" ),
+        ( "osdep/polldev.c",                     "posix" ),
 
         ( "osdep/ar/HIDRemote.m",                "apple-remote" ),
         ( "osdep/macosx_application.m",          "cocoa" ),