Move Winsock poll() emulation to src/win32/

[vlc] / src / network / poll.c

diff --git a/src/network/poll.c b/src/network/poll.c
index c1ca90022af59c4d32fe32c1fd07a3fbdbe5dc62..24335c26afde12fc26dc55a5dc59d95c83aa7c9c 100644 (file)
--- a/src/network/poll.c
+++ b/src/network/poll.c
@@ -71,132 +71,6 @@ int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
     abort ();
 }
 
-#elif defined (WIN32) || defined(__OS2__)
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#ifndef __OS2__
-#ifdef FD_SETSIZE
-/* No, it's not as simple as #undef FD_SETSIZE */
-# error Header inclusion order compromised!
-#endif
-#define FD_SETSIZE 0
-#endif
-#include <vlc_network.h>
-
-#ifdef __OS2__
-#include <sys/time.h>
-#include <sys/select.h>
-
-#define SOCKET unsigned
-#endif
-
-int vlc_poll (struct pollfd *fds, unsigned nfds, int timeout)
-{
-    size_t setsize = sizeof (fd_set) + nfds * sizeof (SOCKET);
-    fd_set *rdset = malloc (setsize);
-    fd_set *wrset = malloc (setsize);
-    fd_set *exset = malloc (setsize);
-    struct timeval tv = { 0, 0 };
-    int val;
-
-    if (unlikely(rdset == NULL || wrset == NULL || exset == NULL))
-    {
-        free (rdset);
-        free (wrset);
-        free (exset);
-        errno = ENOMEM;
-        return -1;
-    }
-
-/* Winsock FD_SET uses FD_SETSIZE in its expansion */
-#undef FD_SETSIZE
-#define FD_SETSIZE (nfds)
-
-resume:
-    val = -1;
-    vlc_testcancel ();
-
-    FD_ZERO (rdset);
-    FD_ZERO (wrset);
-    FD_ZERO (exset);
-    for (unsigned i = 0; i < nfds; i++)
-    {
-        int fd = fds[i].fd;
-        if (val < fd)
-            val = fd;
-
-        /* With POSIX, FD_SET & FD_ISSET are not defined if fd is negative or
-         * bigger or equal than FD_SETSIZE. That is one of the reasons why VLC
-         * uses poll() rather than select(). Most POSIX systems implement
-         * fd_set has a bit field with no sanity checks. This is especially bad
-         * on systems (such as BSD) that have no process open files limit by
-         * default, such that it is quite feasible to get fd >= FD_SETSIZE.
-         * The next instructions will result in a buffer overflow if run on
-         * a POSIX system, and the later FD_ISSET would perform an undefined
-         * memory read.
-         *
-         * With Winsock, fd_set is a table of integers. This is awfully slow.
-         * However, FD_SET and FD_ISSET silently and safely discard excess
-         * entries. Here, overflow cannot happen anyway: fd_set of adequate
-         * size are allocated.
-         * Note that Vista has a much nicer WSAPoll(), but Mingw does not
-         * support it yet.
-         */
-        if (fds[i].events & POLLIN)
-            FD_SET ((SOCKET)fd, rdset);
-        if (fds[i].events & POLLOUT)
-            FD_SET ((SOCKET)fd, wrset);
-        if (fds[i].events & POLLPRI)
-            FD_SET ((SOCKET)fd, exset);
-    }
-
-#ifndef HAVE_ALERTABLE_SELECT
-# warning FIXME! Fix cancellation and remove this crap.
-    if ((timeout < 0) || (timeout > 50))
-    {
-        tv.tv_sec = 0;
-        tv.tv_usec = 50000;
-    }
-    else
-#endif
-    if (timeout >= 0)
-    {
-        div_t d = div (timeout, 1000);
-        tv.tv_sec = d.quot;
-        tv.tv_usec = d.rem * 1000;
-    }
-
-    val = select (val + 1, rdset, wrset, exset,
-                  /*(timeout >= 0) ?*/ &tv /*: NULL*/);
-
-#ifndef HAVE_ALERTABLE_SELECT
-    if (val == 0)
-    {
-        if (timeout > 0)
-            timeout -= (timeout > 50) ? 50 : timeout;
-        if (timeout != 0)
-            goto resume;
-    }
-#endif
-
-    if (val == -1)
-        return -1;
-
-    for (unsigned i = 0; i < nfds; i++)
-    {
-        int fd = fds[i].fd;
-        fds[i].revents = (FD_ISSET (fd, rdset) ? POLLIN : 0)
-                       | (FD_ISSET (fd, wrset) ? POLLOUT : 0)
-                       | (FD_ISSET (fd, exset) ? POLLPRI : 0);
-    }
-    free (exset);
-    free (wrset);
-    free (rdset);
-    return val;
-}
-
 #else
 # error poll() not implemented!
 #endif