RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity

Make url_read_complete handle EAGAIN more intelligently.

Browse Source 
Only retry 2 - 5 times in quick succession and afterwards sleep a bit
to avoid creating high CPU load without any progress.

Originally committed as revision 21427 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2010-01-24 18:09:46 +00:00
parent 0b882b4009
commit f1d2b5728c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avio.c
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "libavutil/avstring.h"
#include "libavcodec/opt.h" #include "libavcodec/opt.h"
#include "os_support.h" #include "os_support.h"
@ -152,14 +155,21 @@ int url_read(URLContext *h, unsigned char *buf, int size)
int url_read_complete(URLContext *h, unsigned char *buf, int size) int url_read_complete(URLContext *h, unsigned char *buf, int size)
{ {
int ret, len; int ret, len;
int fast_retries = 5;
len = 0; len = 0;
while (len < size) { while (len < size) {
ret = url_read(h, buf+len, size-len); ret = url_read(h, buf+len, size-len);
if (ret == AVERROR(EAGAIN)) { if (ret == AVERROR(EAGAIN)) {
ret = 0; ret = 0;
if (fast_retries)
fast_retries--;
else
usleep(1000);
} else if (ret < 1) } else if (ret < 1)
return ret < 0 ? ret : len; return ret < 0 ? ret : len;
if (ret)
fast_retries = FFMAX(fast_retries, 2);
len += ret; len += ret;
} }
return len; return len;