X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=41c2ee1a690a82ebee2623c3f79efe21b8e364e2;hp=eeb7c57a71a52ea26cdeb1ee8751939a6b2518f7;hb=481150224edabeee0a6bbfdab232df58e5c1224e;hpb=19d9318abf42debb15d833d4e56ab636893285c3 diff --git a/dccp_recv.c b/dccp_recv.c index eeb7c57a..41c2ee1a 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -11,6 +11,7 @@ * (C) 2005 Ian McDonald */ +#include #include #include @@ -18,16 +19,15 @@ #include "error.h" #include "list.h" #include "sched.h" +#include "ggo.h" #include "recv.h" #include "string.h" #include "net.h" #include "fd.h" +#include "buffer_tree.h" #include "dccp_recv.cmdline.h" -/** the size of the output buffer */ -#define DCCP_BUFSIZE 40960 - /** * data specific to the dccp receiver * @@ -36,6 +36,7 @@ struct private_dccp_recv_data { /** the file descriptor for the dccp socket */ int fd; + struct btr_pool *btrp; }; @@ -46,8 +47,7 @@ static void dccp_recv_close(struct receiver_node *rn) if (pdd && pdd->fd > 0) close(pdd->fd); - free(rn->buf); - rn->buf = NULL; + btr_pool_free(pdd->btrp); free(rn->private_data); rn->private_data = NULL; } @@ -57,29 +57,79 @@ static int dccp_recv_open(struct receiver_node *rn) { struct private_dccp_recv_data *pdd; struct dccp_recv_args_info *conf = rn->conf; - int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg); + struct flowopts *fo = NULL; + uint8_t *ccids = NULL; + int fd, ret, i; - if (ret < 0) - return ret; + /* Copy CCID preference list (u8 array required) */ + if (conf->ccid_given) { + ccids = para_malloc(conf->ccid_given); + fo = flowopt_new(); - rn->buf = para_calloc(DCCP_BUFSIZE); - rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data)); + for (i = 0; i < conf->ccid_given; i++) + ccids[i] = conf->ccid_arg[i]; + + OPT_ADD(fo, SOL_DCCP, DCCP_SOCKOPT_CCID, ccids, i); + } - pdd->fd = ret; - mark_fd_nonblocking(pdd->fd); + fd = makesock(IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg, fo); + free(ccids); + if (fd < 0) + return fd; + /* + * Disable unused CCIDs: the receiver does not send any application + * data to the server. By shutting down this unused path we reduce + * internal processing costs, as the unused CCIDs (in the kernel) are + * then bypassed. + */ + if (shutdown(fd, SHUT_WR) < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); + goto err; + } + ret = mark_fd_nonblocking(fd); + if (ret < 0) + goto err; + rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data)); + pdd->btrp = btr_pool_new("dccp_recv", 320 * 1024); + pdd->fd = fd; return 1; +err: + close(fd); + return ret; } -static void dccp_shutdown(void) +/** + * Check whether the host supports the requested 'ccid' arguments. + * \param conf DCCP receiver arguments. + * \return True if all CCIDs requested in \a conf are supported. + */ +static bool dccp_recv_ccid_support_check(struct dccp_recv_args_info *conf) { - ; /* nothing to do */ + uint8_t *ccids; + int i, j, nccids; + + nccids = dccp_available_ccids(&ccids); + if (nccids <= 0) + return false; + + for (i = 0; i < conf->ccid_given; i++) { + for (j = 0; j < nccids && ccids[j] != conf->ccid_arg[i]; j++) + ; + if (j == nccids) { + PARA_ERROR_LOG("'CCID-%d' not supported on this host.\n", + conf->ccid_arg[i]); + return false; + } + } + return true; } static void *dccp_recv_parse_config(int argc, char **argv) { - struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info)); + struct dccp_recv_args_info *tmp = para_calloc(sizeof(*tmp)); - if (!dccp_recv_cmdline_parser(argc, argv, tmp)) + if (!dccp_recv_cmdline_parser(argc, argv, tmp) && + dccp_recv_ccid_support_check(tmp)) return tmp; free(tmp); return NULL; @@ -87,55 +137,74 @@ static void *dccp_recv_parse_config(int argc, char **argv) static void dccp_recv_pre_select(struct sched *s, struct task *t) { - struct receiver_node *rn = t->private_data; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_dccp_recv_data *pdd = rn->private_data; - t->ret = 1; + t->error = 0; + if (generic_recv_pre_select(s, t) <= 0) + return; para_fd_set(pdd->fd, &s->rfds, &s->max_fileno); } static void dccp_recv_post_select(struct sched *s, struct task *t) { - struct receiver_node *rn = t->private_data; + struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_dccp_recv_data *pdd = rn->private_data; + struct btr_node *btrn = rn->btrn; + struct iovec iov[2]; + int ret, iovcnt; + size_t num_bytes; - if (rn->output_error && *rn->output_error) { - t->ret = *rn->output_error; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret <= 0) goto out; - } - t->ret = 1; - if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds)) - goto out; /* nothing to do */ - t->ret = -E_DCCP_OVERRUN; - if (rn->loaded >= DCCP_BUFSIZE) + iovcnt = btr_pool_get_buffers(pdd->btrp, iov); + ret = -E_DCCP_OVERRUN; + if (iovcnt == 0) goto out; - t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded, - DCCP_BUFSIZE - rn->loaded); - if (t->ret <= 0) { - if (!t->ret) - t->ret = -E_RECV_EOF; + ret = readv_nonblock(pdd->fd, iov, iovcnt, &s->rfds, &num_bytes); + if (num_bytes == 0) goto out; + if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */ + btr_add_output_pool(pdd->btrp, num_bytes, btrn); + else { /* both buffers contain data */ + btr_add_output_pool(pdd->btrp, iov[0].iov_len, btrn); + btr_add_output_pool(pdd->btrp, num_bytes - iov[0].iov_len, btrn); } - rn->loaded += t->ret; - return; out: - if (t->ret < 0) - rn->error = t->ret; + if (ret >= 0) + return; + btr_remove_node(rn->btrn); + t->error = ret; +} + +static void dccp_recv_free_config(void *conf) +{ + dccp_recv_cmdline_parser_free(conf); + free(conf); } /** - * the init function of the dccp receiver + * The init function of the dccp receiver. * - * \param r pointer to the receiver struct to initialize + * \param r Pointer to the receiver struct to initialize. * - * Initialize all function pointers of \a r + * Initialize all function pointers of \a r. */ void dccp_recv_init(struct receiver *r) { - r->shutdown = dccp_shutdown; + struct dccp_recv_args_info dummy; + + dccp_recv_cmdline_parser_init(&dummy); r->open = dccp_recv_open; r->close = dccp_recv_close; r->pre_select = dccp_recv_pre_select; r->post_select = dccp_recv_post_select; r->parse_config = dccp_recv_parse_config; + r->free_config = dccp_recv_free_config; + r->help = (struct ggo_help) { + .short_help = dccp_recv_args_info_help, + .detailed_help = dccp_recv_args_info_detailed_help + }; + dccp_recv_cmdline_parser_free(&dummy); }