X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=53ef8e60d03f6d7afc4d5b9d7e3b7a2e71c97deb;hp=bedd989ee1f364a751f9e21069f8f2a95c434b94;hb=25518356767bd60bd03ac2f9c6b2381644483925;hpb=ebc3f5891079568a0b0e120e1504170bd6000f78 diff --git a/http_recv.c b/http_recv.c index bedd989e..53ef8e60 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -23,9 +23,6 @@ #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 +31,40 @@ 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 - */ + /** + * 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 descriptors 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; + struct btr_pool *btrp; }; -static void http_shutdown(void) -{ - return; -} - static char *make_request_msg(void) { char *ret, *hn = para_hostname(); @@ -91,81 +80,72 @@ static void http_recv_pre_select(struct sched *s, struct task *t) struct private_http_recv_data *phd = rn->private_data; 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); else para_fd_set(phd->fd, &s->rfds, &s->max_fileno); } -#define HTTP_RECV_MAX_PENDING (1024 * 1024) -#define HTTP_RECV_READ_BUF_SIZE 4096 - static void 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 http_recv_args_info *conf = rn->conf; + struct btr_node *btrn = rn->btrn; + int ret; + char *buf; + size_t sz, n; - if (rn->output_error && *rn->output_error < 0) { - t->error = *rn->output_error; + t->error = 0; + ret = btr_node_status(btrn, 0, BTR_NT_ROOT); + if (ret < 0) + goto err; + if (ret == 0) return; - } - if (phd->status == HTTP_CONNECTED) { + if (phd->status == HTTP_CONNECTED) { char *rq; if (!FD_ISSET(phd->fd, &s->wfds)) return; rq = make_request_msg(); PARA_INFO_LOG("sending http request\n"); - t->error = send_va_buffer(phd->fd, "%s", rq); + ret = send_va_buffer(phd->fd, "%s", rq); free(rq); - if (t->error >= 0) - phd->status = HTTP_SENT_GET_REQUEST; + if (ret < 0) + goto err; + phd->status = HTTP_SENT_GET_REQUEST; return; } - if (!FD_ISSET(phd->fd, &s->rfds)) - return; if (phd->status == HTTP_SENT_GET_REQUEST) { - t->error = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG)); - if (t->error >= 0) { - PARA_INFO_LOG("received ok msg, streaming\n"); - phd->status = HTTP_STREAMING; - } - return; - } - if (conf->buffer_tree_given) { - char *buf; - if (btr_bytes_pending(rn->btrn) > HTTP_RECV_MAX_PENDING) { - t->error = -E_HTTP_RECV_OVERRUN; + ret = read_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds); + if (ret < 0) + goto err; + if (ret == 0) return; - } - buf = para_malloc(HTTP_RECV_READ_BUF_SIZE); - t->error = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE); - if (t->error == 0) - t->error = -E_RECV_EOF; - if (t->error < 0) { - free(buf); - return; - } - btr_add_output(buf, t->error, rn->btrn); + PARA_INFO_LOG("received ok msg, streaming\n"); + phd->status = HTTP_STREAMING; return; } - t->error = -E_HTTP_RECV_OVERRUN; - if (rn->loaded >= BUFSIZE) - return; - t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded, - BUFSIZE - rn->loaded); - if (t->error == 0) - t->error = -E_RECV_EOF; - if (t->error < 0) + ret = -E_HTTP_RECV_OVERRUN; + sz = btr_pool_get_buffer(phd->btrp, &buf); + if (sz == 0) + goto err; + ret = read_nonblock(phd->fd, buf, sz, &s->rfds, &n); + if (n > 0) + btr_add_output_pool(phd->btrp, n, btrn); + if (ret >= 0) return; - rn->loaded += t->error; +err: + btr_remove_node(rn->btrn); + t->error = 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); + btr_pool_free(phd->btrp); free(rn->private_data); } @@ -183,8 +163,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; @@ -194,19 +174,25 @@ 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; phd->status = HTTP_CONNECTED; + phd->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); +} + /** - * the init function of the http receiver + * The init function of the http receiver. * - * \param r pointer to the receiver struct to initialize + * \param r Pointer to the receiver struct to initialize. * - * Just initialize all function pointers of \a r. + * This initializes all function pointers of \a r. */ void http_recv_init(struct receiver *r) { @@ -217,8 +203,8 @@ 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) { .short_help = http_recv_args_info_help, .detailed_help = http_recv_args_info_detailed_help