# HG changeset patch # User reimar # Date 1264356586 0 # Node ID 70488b6f70440d594e5c295e2ed9a1e6f1ebd70d # Parent b862bba5a321ff112c4dee18805471896c0d500f 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. diff -r b862bba5a321 -r 70488b6f7044 avio.c --- a/avio.c Sun Jan 24 16:33:56 2010 +0000 +++ b/avio.c Sun Jan 24 18:09:46 2010 +0000 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/* needed for usleep() */ +#define _XOPEN_SOURCE 600 +#include #include "libavutil/avstring.h" #include "libavcodec/opt.h" #include "os_support.h" @@ -152,14 +155,21 @@ 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;