From: Martin Storsjö <martin@martin.st>
Date: Fri, 26 Mar 2010 16:04:38 +0000 (+0000)
Subject: Don't report EINTR from select as an error, retry select instead
X-Git-Tag: android-x86-4.4-r1~22480
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cae9a15c98eb9b1ba431d2d55a39171783407bc0;p=android-x86%2Fexternal-ffmpeg.git

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

Originally committed as revision 22694 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 35bbc18636..4ef655d563 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -251,6 +251,8 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size)
                 break;
             }
         } else if (n < 0) {
+            if (ff_neterrno() == FF_NETERROR(EINTR))
+                continue;
             return AVERROR(EIO);
         }
     }
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index ae846a4c37..79cabdfe90 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -147,6 +147,8 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
                     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, uint8_t *buf, int size)
             size -= len;
             buf += len;
         } else if (ret < 0) {
+            if (ff_neterrno() == FF_NETERROR(EINTR))
+                continue;
             return -1;
         }
     }
diff --git a/libavformat/udp.c b/libavformat/udp.c
index dc896a43f1..84bca7b0d3 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -437,8 +437,11 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
         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);