X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=5520c6fb65b29f9d12575b211cb990dd53e7d8d3;hp=0c5a3abf3fd58546ea187fee33516bd761973731;hb=de7b5b177b8ad295820bd14c00b049fd8a5ec21f;hpb=d17f43b13cffb458a9931e878086e3d2caa28d25 diff --git a/udp_recv.c b/udp_recv.c index 0c5a3abf..5520c6fb 100644 --- a/udp_recv.c +++ b/udp_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -23,8 +23,6 @@ #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. * @@ -40,134 +38,79 @@ 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; - int ret; - if (rn->btrn) { - ret = generic_recv_pre_select(s, t); - if (ret <= 0) - return; - } + 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; -} - -static void udp_recv_post_select_nobtr(__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; + 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; } - 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) - return; -success: - t->error = 1; + 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_btr(__a_unused struct sched *s, struct task *t) +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; struct btr_node *btrn = rn->btrn; - int ret; - char *buf = NULL; - size_t packet_size, bufsize; + 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 err; - if (ret == 0) - return; - if (!FD_ISSET(purd->fd, &s->rfds)) - return; - bufsize = btr_pool_get_buffer(purd->btrp, &buf); + if (ret <= 0) + goto out; + iovcnt = btr_pool_get_buffers(purd->btrp, iov); ret = -E_UDP_OVERRUN; - if (bufsize == 0) - goto err; - ret = recv_bin_buffer(purd->fd, buf, bufsize); - if (ret == 0) - ret = -E_RECV_EOF; + 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 err; - packet_size = ret; - if (packet_size >= FEC_EOF_PACKET_LEN) { - if (!memcmp(buf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN)) { - PARA_CRIT_LOG("%p: eof\n", rn); - ret = -E_RECV_EOF; - goto err; - } + 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); } - btr_pool_allocate(purd->btrp, packet_size); - btr_add_output_pool(purd->btrp, buf, packet_size, btrn); - return; -err: + ret = readv_ret; +out: + if (ret >= 0) + return; btr_remove_node(btrn); t->error = ret; close(purd->fd); purd->fd = -1; } -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); - if (rn->btrn) - return udp_recv_post_select_btr(s, t); - udp_recv_post_select_nobtr(s, t); -} - -static void udp_shutdown(void) -{ - return; -} - static void udp_recv_close(struct receiver_node *rn) { struct private_udp_recv_data *purd = rn->private_data; if (purd->fd >= 0) close(purd->fd); - PARA_CRIT_LOG("%p: close\n", rn); btr_pool_free(purd->btrp); free(rn->private_data); - free(rn->buf); } static void *udp_recv_parse_config(int argc, char **argv) @@ -251,11 +194,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; @@ -263,7 +205,7 @@ 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); @@ -271,19 +213,19 @@ static int udp_recv_open(struct receiver_node *rn) close(purd->fd); goto err; } - PARA_CRIT_LOG("rn %p: receiving from %s:%d, fd=%d\n", rn, 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(320 * 1024); + 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); } /** @@ -298,7 +240,6 @@ 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;