X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=def5e6201f45f6da58da8c41edc87665bc50899e;hp=ed362bfa0f201c813a5a2860258b5cdba757c58c;hb=217c259f244ec0d00e90a313b3a8b6e79d77054f;hpb=c282c836791cedf57c128555af90af37c7c01c05

diff --git a/http_recv.c b/http_recv.c
index ed362bfa..def5e620 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -34,41 +34,38 @@
 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)
@@ -103,8 +100,6 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
 		para_fd_set(phd->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)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
@@ -150,16 +145,21 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	}
 	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;
@@ -184,6 +184,7 @@ static void http_recv_close(struct receiver_node *rn)
 	struct private_http_recv_data *phd = rn->private_data;
 
 	close(phd->fd);
+	btr_pool_free(phd->btrp);
 	free(rn->buf);
 	free(rn->private_data);
 }
@@ -217,6 +218,7 @@ static int http_recv_open(struct receiver_node *rn)
 	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;
 }