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 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;
+ struct btr_pool *btrp;
};
static void http_shutdown(void)
para_fd_set(phd->fd, &s->rfds, &s->max_fileno);
}
-#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);
}
if (btrn) {
char *buf;
+ size_t sz;
- buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
- ret = recv_bin_buffer(phd->fd, buf, HTTP_RECV_READ_BUF_SIZE);
+ sz = btr_pool_get_buffer(phd->btrp, &buf);
+ //PARA_CRIT_LOG("max buffer %p: %zu\n", buf, sz);
+ ret = -E_HTTP_RECV_OVERRUN;
+ if (sz == 0)
+ goto err;
+ //buf = para_malloc(HTTP_RECV_READ_BUF_SIZE);
+ //sz = HTTP_RECV_READ_BUF_SIZE;
+ ret = recv_bin_buffer(phd->fd, buf, sz);
if (ret == 0)
ret = -E_RECV_EOF;
- if (ret < 0) {
- free(buf);
+ if (ret < 0)
goto err;
- }
- btr_add_output(buf, ret, btrn);
+ btr_add_output_pool(phd->btrp, ret, btrn);
return;
}
ret = -E_HTTP_RECV_OVERRUN;
struct private_http_recv_data *phd = rn->private_data;
close(phd->fd);
+ btr_pool_free(phd->btrp);
free(rn->buf);
free(rn->private_data);
- http_recv_cmdline_parser_free(rn->conf);
}
static void *http_recv_parse_config(int argc, char **argv)
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);
+}
+
/**
- * 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)
{
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