Changeset a5ef7ce0f308caca8b7a41d66e0aae4c653344b1

Timestamp:

12/02/07 18:31:53 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1171301513 +0000

git-parent:

[1c3bc8974c3b0acf191be3e5ebaf4c00634411fa]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1171301513 +0000

Message:

Use poll() always and fix terrible bug due to #ifdefs

Files:

• src/network/io.c (modified) (4 diffs)

src/network/io.c

@@ -287 +287 @@
-        unsigned i;
-        ssize_t n;
-#ifdef HAVE_POLL
-        struct pollfd ufd[fdc];
-#else
-        int maxfd = -1;
-        fd_set set;
-#endif
-
-        int delay_ms = 500;
@@ -304 +299 @@
-        }
-
-#ifdef HAVE_POLL
-        memset (ufd, 0, sizeof (ufd));
-
@@ -314 +308 @@
-
-        n = poll( ufd, fdc, delay_ms );
-#else
-        FD_ZERO (&set);
-
-        for( i = 0; i < fdc; i++ )
-        {
-#if !defined(WIN32) && !defined(UNDER_CE)
-            if( fdv[i] >= FD_SETSIZE )
-            {
-                /* We don't want to overflow select() fd_set */
-                msg_Err( p_this, "select set overflow" );
-                return -1;
-            }
-#endif
-            FD_SET( fdv[i], &set );
-            if( fdv[i] > maxfd )
-                maxfd = fdv[i];
-        }
-
-        n = select( maxfd + 1, &set, NULL, NULL,
-                    (wait_ms == -1) ? NULL
-                                  : &(struct timeval){ 0, delay_ms * 1000 } );
-#endif
-        if( n == -1 )
-            goto error;
@@ -346 +318 @@
-        for (i = 0;; i++)
-        {
-#ifdef HAVE_POLL
-            if ((i_total > 0) && (ufd[i].revents & POLLERR))
-                return i_total; // error will be dequeued on next run
-
-            if ((ufd[i].revents & POLLIN) == 0)
-#else
-            if (!FD_ISSET (fdv[i], &set))
-                continue;
-
+
-            fdc = 1;
-            fdv += i;