[FFmpeg-cvslog] r21427 - trunk/libavformat/avio.c

[reimar]

Author: reimar
Date: Sun Jan 24 19:09:46 2010
New Revision: 21427

Log:
Make url_read_complete handle EAGAIN more intelligently.
Only retry 2 - 5 times in quick succession and afterwards sleep a bit
to avoid creating high CPU load without any progress.

Modified:
   trunk/libavformat/avio.c

Modified: trunk/libavformat/avio.c
==============================================================================
--- trunk/libavformat/avio.c	Sun Jan 24 19:07:29 2010	(r21426)
+++ trunk/libavformat/avio.c	Sun Jan 24 19:09:46 2010	(r21427)
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/* needed for usleep() */
+#define _XOPEN_SOURCE 600
+#include <unistd.h>
 #include "libavutil/avstring.h"
 #include "libavcodec/opt.h"
 #include "os_support.h"
@@ -152,14 +155,21 @@ int url_read(URLContext *h, unsigned cha
 int url_read_complete(URLContext *h, unsigned char *buf, int size)
 {
     int ret, len;
+    int fast_retries = 5;
 
     len = 0;
     while (len < size) {
         ret = url_read(h, buf+len, size-len);
         if (ret == AVERROR(EAGAIN)) {
             ret = 0;
+            if (fast_retries)
+                fast_retries--;
+            else
+                usleep(1000);
         } else if (ret < 1)
             return ret < 0 ? ret : len;
+        if (ret)
+           fast_retries = FFMAX(fast_retries, 2);
         len += ret;
     }
     return len;