highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proto: factor ff_network_wait_fd and use it on udp

Browse Source 
Support the URL_FLAG_NONBLOCK semantic and uniform the protocol.
The quick retry loop is already part of retry_transfer_wrapper.

The polling routine is common to the network protocols:
udp, tcp and, once merged, sctp.
This commit is contained in:
Luca Barbato 2011-04-04 18:17:12 +02:00
parent 1f6265e011
commit ebba2b3e2a
3 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/network.h
View File

@ -55,6 +55,10 @@ static inline int ff_neterrno() {
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
#if HAVE_POLL_H
#include <poll.h>
#endif
int ff_socket_nonblock(int socket, int enable); int ff_socket_nonblock(int socket, int enable);
static inline int ff_network_init(void) static inline int ff_network_init(void)
@ -67,6 +71,15 @@ static inline int ff_network_init(void)
return 1; return 1;
} }
static inline int ff_network_wait_fd(int fd, int write)
{
int ev = write ? POLLOUT : POLLIN;
struct pollfd p = { .fd = fd, .events = ev, .revents = 0 };
int ret;
ret = poll(&p, 1, 100);
return ret < 0 ? ff_neterrno() : p.revents & ev ? 0 : AVERROR(EAGAIN);
}
static inline void ff_network_close(void) static inline void ff_network_close(void)
{ {
#if HAVE_WINSOCK2_H #if HAVE_WINSOCK2_H

14
libavformat/tcp.c
View File

@ -131,23 +131,13 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
return ret; return ret;
} }
static int tcp_wait_fd(int fd, int write)
{
int ev = write ? POLLOUT : POLLIN;
struct pollfd p = { .fd = fd, .events = ev, .revents = 0 };
int ret;
ret = poll(&p, 1, 100);
return ret < 0 ? ff_neterrno() : p.revents & ev ? 0 : AVERROR(EAGAIN);
}
static int tcp_read(URLContext *h, uint8_t *buf, int size) static int tcp_read(URLContext *h, uint8_t *buf, int size)
{ {
TCPContext *s = h->priv_data; TCPContext *s = h->priv_data;
int ret; int ret;
if (!(h->flags & URL_FLAG_NONBLOCK)) { if (!(h->flags & URL_FLAG_NONBLOCK)) {
ret = tcp_wait_fd(s->fd, 0); ret = ff_network_wait_fd(s->fd, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -161,7 +151,7 @@ static int tcp_write(URLContext *h, const uint8_t *buf, int size)
int ret; int ret;
if (!(h->flags & URL_FLAG_NONBLOCK)) { if (!(h->flags & URL_FLAG_NONBLOCK)) {
ret = tcp_wait_fd(s->fd, 1); ret = ff_network_wait_fd(s->fd, 1);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }

59
libavformat/udp.c
View File

@ -33,9 +33,6 @@
#include "internal.h" #include "internal.h"
#include "network.h" #include "network.h"
#include "os_support.h" #include "os_support.h"
#if HAVE_POLL_H
#include <poll.h>
#endif
#include <sys/time.h> #include <sys/time.h>
#ifndef IPV6_ADD_MEMBERSHIP #ifndef IPV6_ADD_MEMBERSHIP
@ -447,31 +444,15 @@ static int udp_open(URLContext *h, const char *uri, int flags)
static int udp_read(URLContext *h, uint8_t *buf, int size) static int udp_read(URLContext *h, uint8_t *buf, int size)
{ {
UDPContext *s = h->priv_data; UDPContext *s = h->priv_data;
struct pollfd p = {s->udp_fd, POLLIN, 0};
int len;
int ret; int ret;
for(;;) { if (!(h->flags & URL_FLAG_NONBLOCK)) {
if (url_interrupt_cb()) ret = ff_network_wait_fd(s->udp_fd, 0);
return AVERROR_EXIT; if (ret < 0)
ret = poll(&p, 1, 100); return ret;
if (ret < 0) {
if (ff_neterrno() == AVERROR(EINTR))
continue;
return AVERROR(EIO);
}
if (!(ret == 1 && p.revents & POLLIN))
continue;
len = recv(s->udp_fd, buf, size, 0);
if (len < 0) {
if (ff_neterrno() != AVERROR(EAGAIN) &&
ff_neterrno() != AVERROR(EINTR))
return AVERROR(EIO);
} else {
break;
}
} }
return len; ret = recv(s->udp_fd, buf, size, 0);
return ret < 0 ? ff_neterrno() : ret;
} }
static int udp_write(URLContext *h, const uint8_t *buf, int size) static int udp_write(URLContext *h, const uint8_t *buf, int size)
@ -479,22 +460,20 @@ static int udp_write(URLContext *h, const uint8_t *buf, int size)
UDPContext *s = h->priv_data; UDPContext *s = h->priv_data;
int ret; int ret;
for(;;) { if (!(h->flags & URL_FLAG_NONBLOCK)) {
if (!s->is_connected) { ret = ff_network_wait_fd(s->udp_fd, 1);
ret = sendto (s->udp_fd, buf, size, 0, if (ret < 0)
(struct sockaddr *) &s->dest_addr, return ret;
s->dest_addr_len);
} else
ret = send(s->udp_fd, buf, size, 0);
if (ret < 0) {
if (ff_neterrno() != AVERROR(EINTR) &&
ff_neterrno() != AVERROR(EAGAIN))
return ff_neterrno();
} else {
break;
}
} }
return size;
if (!s->is_connected) {
ret = sendto (s->udp_fd, buf, size, 0,
(struct sockaddr *) &s->dest_addr,
s->dest_addr_len);
} else
ret = send(s->udp_fd, buf, size, 0);
return ret < 0 ? ff_neterrno() : ret;
} }
static int udp_close(URLContext *h) static int udp_close(URLContext *h)