generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Originally committed as revision 22694 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-03-26 16:04:38 +00:00
parent 3fd427cd19
commit cae9a15c98
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpproto.c
View File

@ -251,6 +251,8 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size)
break; break;
} }
} else if (n < 0) { } else if (n < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
continue;
return AVERROR(EIO); return AVERROR(EIO);
} }
} }

4
libavformat/tcp.c
View File

@ -147,6 +147,8 @@ static int tcp_read(URLContext *h, uint8_t *buf, int size)
return AVERROR(ff_neterrno()); return AVERROR(ff_neterrno());
} else return len; } else return len;
} else if (ret < 0) { } else if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
continue;
return -1; return -1;
} }
} }
@ -180,6 +182,8 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size)
size -= len; size -= len;
buf += len; buf += len;
} else if (ret < 0) { } else if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
continue;
return -1; return -1;
} }
} }

5
libavformat/udp.c
View File

@ -437,8 +437,11 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 100 * 1000; tv.tv_usec = 100 * 1000;
ret = select(s->udp_fd + 1, &rfds, NULL, NULL, &tv); 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); return AVERROR(EIO);
}
if (!(ret > 0 && FD_ISSET(s->udp_fd, &rfds))) if (!(ret > 0 && FD_ISSET(s->udp_fd, &rfds)))
continue; continue;
len = recv(s->udp_fd, buf, size, 0); len = recv(s->udp_fd, buf, size, 0);