X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=20e00033abf01ae7013e59117f1a10bafa592f05;hp=8f4ca2b57b46362119f81277f09720de2e4c38fe;hb=d8213149049056e0cabbcbe575a10dfb1a83583e;hpb=aa234b7afe223879a7bd7274ce05a3a315a2ec49

diff --git a/http_recv.c b/http_recv.c
index 8f4ca2b5..20e00033 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -97,18 +97,27 @@ 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_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;
 
-	if (rn->output_error && *rn->output_error < 0) {
-		t->error = *rn->output_error;
-		goto err;
+	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;
+		}
 	}
 	if (phd->status == HTTP_CONNECTED) {
 		char *rq;
@@ -116,9 +125,9 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 			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)
+		if (ret < 0)
 			goto err;
 		phd->status = HTTP_SENT_GET_REQUEST;
 		return;
@@ -126,51 +135,42 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	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)
+		ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+		if (ret < 0)
 			goto err;
 		PARA_INFO_LOG("received ok msg, streaming\n");
 		phd->status = HTTP_STREAMING;
 		return;
 	}
-	if (conf->buffer_tree_given) {
+	if (btrn) {
 		char *buf;
 
-		if (btr_no_children(rn->btrn)) {
-			t->error = -E_HTTP_RECV_NO_CHILD;
-			goto err;
-		}
-		if (btr_bytes_pending(rn->btrn) > HTTP_RECV_MAX_PENDING) {
-			t->error = -E_HTTP_RECV_OVERRUN;
-			goto err;
-		}
 		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) {
+		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, t->error, rn->btrn);
+		btr_add_output(buf, ret, btrn);
 		return;
 	}
-	t->error = -E_HTTP_RECV_OVERRUN;
+	ret = -E_HTTP_RECV_OVERRUN;
 	if (rn->loaded >= BUFSIZE)
 		goto err;
-	t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+	ret = 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)
+	if (ret == 0)
+		ret = -E_RECV_EOF;
+	if (ret < 0)
 		goto err;
-	rn->loaded += t->error;
+	rn->loaded += ret;
 	return;
 err:
-	if (conf->buffer_tree_given) {
+	if (btrn)
 		btr_remove_node(rn->btrn);
-		rn->btrn = NULL;
-	}
+	t->error = ret;
 }
 
 static void http_recv_close(struct receiver_node *rn)