[FFmpeg-cvslog] r22694 - in trunk/libavformat: rtpproto.c tcp.c udp.c

[mstorsjo]

Author: mstorsjo
Date: Fri Mar 26 17:04:38 2010
New Revision: 22694

Log:
Don't report EINTR from select as an error, retry select instead

Modified:
   trunk/libavformat/rtpproto.c
   trunk/libavformat/tcp.c
   trunk/libavformat/udp.c

Modified: trunk/libavformat/rtpproto.c
==============================================================================
--- trunk/libavformat/rtpproto.c	Fri Mar 26 10:56:57 2010	(r22693)
+++ trunk/libavformat/rtpproto.c	Fri Mar 26 17:04:38 2010	(r22694)
@@ -251,6 +251,8 @@ static int rtp_read(URLContext *h, uint8
                 break;
             }
         } else if (n < 0) {
+            if (ff_neterrno() == FF_NETERROR(EINTR))
+                continue;
             return AVERROR(EIO);
         }
     }

Modified: trunk/libavformat/tcp.c
==============================================================================
--- trunk/libavformat/tcp.c	Fri Mar 26 10:56:57 2010	(r22693)
+++ trunk/libavformat/tcp.c	Fri Mar 26 17:04:38 2010	(r22694)
@@ -147,6 +147,8 @@ static int tcp_read(URLContext *h, uint8
                     return AVERROR(ff_neterrno());
             } else return len;
         } else if (ret < 0) {
+            if (ff_neterrno() == FF_NETERROR(EINTR))
+                continue;
             return -1;
         }
     }
@@ -180,6 +182,8 @@ static int tcp_write(URLContext *h, uint
             size -= len;
             buf += len;
         } else if (ret < 0) {
+            if (ff_neterrno() == FF_NETERROR(EINTR))
+                continue;
             return -1;
         }
     }

Modified: trunk/libavformat/udp.c
==============================================================================
--- trunk/libavformat/udp.c	Fri Mar 26 10:56:57 2010	(r22693)
+++ trunk/libavformat/udp.c	Fri Mar 26 17:04:38 2010	(r22694)
@@ -437,8 +437,11 @@ static int udp_read(URLContext *h, uint8
         tv.tv_sec = 0;
         tv.tv_usec = 100 * 1000;
         ret = select(s->udp_fd + 1, &rfds, NULL, NULL, &tv);
-        if (ret < 0)
+        if (ret < 0) {
+            if (ff_neterrno() == FF_NETERROR(EINTR))
+                continue;
             return AVERROR(EIO);
+        }
         if (!(ret > 0 && FD_ISSET(s->udp_fd, &rfds)))
             continue;
         len = recv(s->udp_fd, buf, size, 0);