X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=45d24eae2cd40e9ee4b53106b92ccb85c779dc85;hp=f9782985d113d390c70300d099546066203f188d;hb=bda95f9508b456dcea89d300f6d4104e30ab9f3e;hpb=a4eb244ecdf9aaa0f167b3c91d3e276bde99d681 diff --git a/udp_recv.c b/udp_recv.c index f9782985..45d24eae 100644 --- a/udp_recv.c +++ b/udp_recv.c @@ -1,12 +1,11 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file udp_recv.c Paraslash's udp receiver */ #include -#include #include #include @@ -18,13 +17,11 @@ #include "ggo.h" #include "recv.h" #include "udp_recv.cmdline.h" -#include "audiod.h" #include "string.h" #include "net.h" #include "fd.h" +#include "buffer_tree.h" -/** The size of the receiver node buffer. */ -#define UDP_RECV_CHUNK_SIZE (128 * 1024) /** * Data specific to the udp receiver. * @@ -33,6 +30,7 @@ struct private_udp_recv_data { /** The socket file descriptor. */ int fd; + struct btr_pool *btrp; }; static void udp_recv_pre_select(struct sched *s, struct task *t) @@ -40,63 +38,68 @@ static void udp_recv_pre_select(struct sched *s, struct task *t) struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_udp_recv_data *purd = rn->private_data; + if (generic_recv_pre_select(s, t) <= 0) + return; para_fd_set(purd->fd, &s->rfds, &s->max_fileno); } -static int enough_space(size_t nbytes, size_t loaded) -{ - return nbytes + loaded < UDP_RECV_CHUNK_SIZE; -} - -static int add_rn_output(struct receiver_node *rn, char *buf, size_t len) +static int udp_check_eof(size_t sz, struct iovec iov[2]) { - if (!len) - return 1; - if (!enough_space(len, rn->loaded)) - return -E_UDP_OVERRUN; - memcpy(rn->buf + rn->loaded, buf, len); - rn->loaded += len; - return 1; + if (sz < FEC_EOF_PACKET_LEN) + return 0; + if (iov[0].iov_len >= FEC_EOF_PACKET_LEN) { + if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, + FEC_EOF_PACKET_LEN) != 0) + return 0; + return -E_RECV_EOF; + } + if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0) + return 0; + if (memcmp(iov[1].iov_base, FEC_EOF_PACKET + iov[0].iov_len, + FEC_EOF_PACKET_LEN - iov[0].iov_len) != 0) + return 0; + return -E_RECV_EOF; } static void udp_recv_post_select(__a_unused struct sched *s, struct task *t) { struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_udp_recv_data *purd = rn->private_data; - int ret; - char tmpbuf[UDP_RECV_CHUNK_SIZE]; - size_t packet_size; - - if (rn->output_error && *rn->output_error < 0) { - t->error = *rn->output_error; - return; - } - if (!FD_ISSET(purd->fd, &s->rfds)) - return; - ret = recv_bin_buffer(purd->fd, tmpbuf, UDP_RECV_CHUNK_SIZE); - if (ret < 0) { - if (is_errno(ret, EINTR) || is_errno(ret, EAGAIN)) - goto success; - t->error = ret; - return; + struct btr_node *btrn = rn->btrn; + size_t num_bytes; + struct iovec iov[2]; + int ret, readv_ret, iovcnt; + + t->error = 0; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret <= 0) + goto out; + iovcnt = btr_pool_get_buffers(purd->btrp, iov); + ret = -E_UDP_OVERRUN; + if (iovcnt == 0) + goto out; + ret = readv_nonblock(purd->fd, iov, iovcnt, &s->rfds, &num_bytes); + if (num_bytes == 0) + goto out; + readv_ret = ret; + ret = udp_check_eof(num_bytes, iov); + if (ret < 0) + goto out; + if (iov[0].iov_len >= num_bytes) + btr_add_output_pool(purd->btrp, num_bytes, btrn); + else { /* both buffers contain data */ + btr_add_output_pool(purd->btrp, iov[0].iov_len, btrn); + btr_add_output_pool(purd->btrp, num_bytes - iov[0].iov_len, + btrn); } - t->error = -E_RECV_EOF; - if (!ret) - return; - packet_size = ret; - if (packet_size >= FEC_EOF_PACKET_LEN) - if (!memcmp(tmpbuf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN)) - return; - t->error = add_rn_output(rn, tmpbuf, packet_size); - if (t->error < 0) + ret = readv_ret; +out: + if (ret >= 0) return; -success: - t->error = 1; -} - -static void udp_shutdown(void) -{ - return; + btr_remove_node(btrn); + t->error = ret; + close(purd->fd); + purd->fd = -1; } static void udp_recv_close(struct receiver_node *rn) @@ -105,8 +108,8 @@ static void udp_recv_close(struct receiver_node *rn) if (purd->fd >= 0) close(purd->fd); + btr_pool_free(purd->btrp); free(rn->private_data); - free(rn->buf); } static void *udp_recv_parse_config(int argc, char **argv) @@ -138,9 +141,11 @@ static int mcast_receiver_setup(int fd, const char *iface) if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0) goto err; + assert(ss.ss_family == AF_INET || ss.ss_family == AF_INET6); if (iface != NULL && id == 0) - PARA_WARNING_LOG("could not resolve interface %s, using default", iface); + PARA_WARNING_LOG("could not resolve interface %s, using default\n", + iface); switch (ss.ss_family) { case AF_INET: @@ -155,12 +160,13 @@ static int mcast_receiver_setup(int fd, const char *iface) m4.imr_interface.s_addr = INADDR_ANY; if (id != 0) - PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported."); + PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported\n"); #endif - m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr; + m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr; - if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &m4, sizeof(m4)) < 0) + if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, + &m4, sizeof(m4)) < 0) break; } return 0; @@ -175,9 +181,6 @@ static int mcast_receiver_setup(int fd, const char *iface) break; } return 0; - default: - PARA_ERROR_LOG("address family %d not supported", ss.ss_family); - return -E_ADDRESS_LOOKUP; } err: return -ERRNO_TO_PARA_ERROR(errno); @@ -190,11 +193,10 @@ static int udp_recv_open(struct receiver_node *rn) char *iface = c->iface_given ? c->iface_arg : NULL; int ret; - rn->buf = para_calloc(UDP_RECV_CHUNK_SIZE); rn->private_data = para_calloc(sizeof(struct private_udp_recv_data)); purd = rn->private_data; - ret = makesock(AF_UNSPEC, IPPROTO_UDP, 1, c->host_arg, c->port_arg); + ret = makesock(IPPROTO_UDP, 1, c->host_arg, c->port_arg, NULL); if (ret < 0) goto err; purd->fd = ret; @@ -202,21 +204,29 @@ static int udp_recv_open(struct receiver_node *rn) ret = mcast_receiver_setup(purd->fd, iface); if (ret < 0) { close(purd->fd); - return ret; + goto err; } ret = mark_fd_nonblocking(purd->fd); - if (ret < 0) + if (ret < 0) { + close(purd->fd); goto err; - PARA_NOTICE_LOG("receiving from %s:%d, fd=%d\n", c->host_arg, + } + PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg, c->port_arg, purd->fd); + purd->btrp = btr_pool_new("udp_recv", 320 * 1024); return purd->fd; err: free(rn->private_data); - free(rn->buf); return ret; } +static void udp_recv_free_config(void *conf) +{ + udp_recv_cmdline_parser_free(conf); + free(conf); +} + /** * The init function of the udp receiver. * @@ -229,12 +239,12 @@ void udp_recv_init(struct receiver *r) struct udp_recv_args_info dummy; udp_recv_cmdline_parser_init(&dummy); - r->shutdown = udp_shutdown; r->open = udp_recv_open; r->close = udp_recv_close; r->pre_select = udp_recv_pre_select; r->post_select = udp_recv_post_select; r->parse_config = udp_recv_parse_config; + r->free_config = udp_recv_free_config; r->help = (struct ggo_help) { .short_help = udp_recv_args_info_help, .detailed_help = udp_recv_args_info_detailed_help