X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=f1d8593068ad92bd7d86730bbf5d9dbc65d38376;hp=ed362bfa0f201c813a5a2860258b5cdba757c58c;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=c282c836791cedf57c128555af90af37c7c01c05 diff --git a/http_recv.c b/http_recv.c index ed362bfa..f1d85930 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include "para.h" #include "error.h" @@ -16,15 +15,12 @@ #include "list.h" #include "sched.h" #include "ggo.h" +#include "buffer_tree.h" #include "recv.h" #include "http_recv.cmdline.h" #include "net.h" #include "string.h" #include "fd.h" -#include "buffer_tree.h" - -/** the output buffer size of the http receiver */ -#define BUFSIZE (32 * 1024) /** * the possible states of a http receiver node @@ -34,48 +30,22 @@ enum http_recv_status {HTTP_CONNECTED, HTTP_SENT_GET_REQUEST, HTTP_STREAMING}; /** - * data specific to the http receiver + * Data specific to the http receiver. * * Each running instance of the http receiver reserves space for one such struct. */ struct private_http_recv_data { -/** - * - * - * the current status of the http receiver node - * - * It gets initialized to \p HTTP_CONNECTED by the open function of the - * http receiver. - * - * \sa receiver::open, receiver_node. - */ + /** + * The current status of the http receiver node. + * + * It gets initialized to \p HTTP_CONNECTED by the open function of the + * http receiver. + * + * \sa receiver::open, receiver_node. + */ enum http_recv_status status; -/** - * - * - * the file descriptor used for receiving the http stream - * - * The pre_select function of the http receiver adds this file descriptor to - * the set of file decriptors which are checked for reading/writing (depending - * on the current status) by the select loop of the application (para_audiod or - * para_recv). - * - * The post_select function of the http receiver uses \a fd, if ready, to - * establish the http connection, and updates \a status according to the new - * state of the connection. As soon as \a status is \p HTTP_STREAMING, \a fd is - * going to be only checked for reading. If data is available, it is read into - * the output buffer of the receiver node by post_select. - * - * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status - */ - int fd; }; -static void http_shutdown(void) -{ - return; -} - static char *make_request_msg(void) { char *ret, *hn = para_hostname(); @@ -89,108 +59,89 @@ static void http_recv_pre_select(struct sched *s, struct task *t) { struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_http_recv_data *phd = rn->private_data; - int ret; - if (rn->btrn) { - ret = generic_recv_pre_select(s, t); - if (ret <= 0) - return; - } - t->error = 0; + if (generic_recv_pre_select(s, t) <= 0) + return; if (phd->status == HTTP_CONNECTED) - para_fd_set(phd->fd, &s->wfds, &s->max_fileno); + para_fd_set(rn->fd, &s->wfds, &s->max_fileno); else - para_fd_set(phd->fd, &s->rfds, &s->max_fileno); + para_fd_set(rn->fd, &s->rfds, &s->max_fileno); } -#define HTTP_RECV_READ_BUF_SIZE 16384 - -static void http_recv_post_select(struct sched *s, struct task *t) +/* + * Establish the http connection. If already established, fill the buffer pool + * area with data read from the socket. In any case, update the state of the + * connection if necessary. + */ +static int http_recv_post_select(struct sched *s, struct task *t) { struct receiver_node *rn = container_of(t, struct receiver_node, task); struct private_http_recv_data *phd = rn->private_data; struct btr_node *btrn = rn->btrn; - int ret; + int ret, iovcnt; + struct iovec iov[2]; + size_t num_bytes; - t->error = 0; - if (btrn) { - ret = btr_node_status(btrn, 0, BTR_NT_ROOT); - if (ret < 0) - goto err; - if (ret == 0) - return; - } else { - if (rn->output_error && *rn->output_error < 0) { - ret = *rn->output_error; - goto err; - } - } + ret = task_get_notification(t); + if (ret < 0) + goto out; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret < 0) + goto out; + if (ret == 0) + return 0; if (phd->status == HTTP_CONNECTED) { char *rq; - if (!FD_ISSET(phd->fd, &s->wfds)) - return; + if (!FD_ISSET(rn->fd, &s->wfds)) + return 0; rq = make_request_msg(); PARA_INFO_LOG("sending http request\n"); - ret = send_va_buffer(phd->fd, "%s", rq); + ret = write_va_buffer(rn->fd, "%s", rq); free(rq); if (ret < 0) - goto err; + goto out; phd->status = HTTP_SENT_GET_REQUEST; - return; + return 0; } - if (!FD_ISSET(phd->fd, &s->rfds)) - return; if (phd->status == HTTP_SENT_GET_REQUEST) { - ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG)); + ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds); if (ret < 0) - goto err; + goto out; + if (ret == 0) + return 0; PARA_INFO_LOG("received ok msg, streaming\n"); phd->status = HTTP_STREAMING; - return; - } - if (btrn) { - char *buf; - - buf = para_malloc(HTTP_RECV_READ_BUF_SIZE); - ret = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE); - if (ret == 0) - ret = -E_RECV_EOF; - if (ret < 0) { - free(buf); - goto err; - } - btr_add_output(buf, ret, btrn); - return; + return 0; } ret = -E_HTTP_RECV_OVERRUN; - if (rn->loaded >= BUFSIZE) - goto err; - ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded, - BUFSIZE - rn->loaded); - if (ret == 0) - ret = -E_RECV_EOF; + iovcnt = btr_pool_get_buffers(rn->btrp, iov); + if (iovcnt == 0) + goto out; + ret = readv_nonblock(rn->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(rn->btrp, num_bytes, btrn); + else { /* both buffers contain data */ + btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn); + btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len, btrn); + } +out: if (ret < 0) - goto err; - rn->loaded += ret; - return; -err: - if (btrn) - btr_remove_node(rn->btrn); - t->error = ret; + btr_remove_node(&rn->btrn); + return ret; } static void http_recv_close(struct receiver_node *rn) { - struct private_http_recv_data *phd = rn->private_data; - - close(phd->fd); - free(rn->buf); + close(rn->fd); + btr_pool_free(rn->btrp); free(rn->private_data); } static void *http_recv_parse_config(int argc, char **argv) { - struct http_recv_args_info *tmp = para_calloc(sizeof(struct http_recv_args_info)); + struct http_recv_args_info *tmp = para_calloc(sizeof(*tmp)); if (!http_recv_cmdline_parser(argc, argv, tmp)) return tmp; @@ -202,8 +153,8 @@ static int http_recv_open(struct receiver_node *rn) { struct private_http_recv_data *phd; struct http_recv_args_info *conf = rn->conf; - int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, - conf->port_arg); + int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg, + conf->port_arg); if (ret < 0) return ret; @@ -213,16 +164,17 @@ static int http_recv_open(struct receiver_node *rn) close(fd); return ret; } - rn->buf = para_calloc(BUFSIZE); rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data)); - phd->fd = fd; + rn->fd = fd; phd->status = HTTP_CONNECTED; + rn->btrp = btr_pool_new("http_recv", 320 * 1024); return 1; } static void http_recv_free_config(void *conf) { http_recv_cmdline_parser_free(conf); + free(conf); } /** @@ -241,7 +193,6 @@ void http_recv_init(struct receiver *r) r->close = http_recv_close; r->pre_select = http_recv_pre_select; r->post_select = http_recv_post_select; - r->shutdown = http_shutdown; r->parse_config = http_recv_parse_config; r->free_config = http_recv_free_config; r->help = (struct ggo_help) {