X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=16e16465ad2d9671c6d9e818f10caed6aae2cb91;hp=d167cd1460225ad964c343b6129aedcac7c73c65;hb=3010ef96e10cb15d423eef8f9802fbed78744393;hpb=84b0b12f1f485c54f9e78fed1359105c611f8fbf

diff --git a/stdout.c b/stdout.c
index d167cd14..16e16465 100644
--- a/stdout.c
+++ b/stdout.c
@@ -48,19 +48,17 @@ static void stdout_pre_select(struct sched *s, struct task *t)
 static void stdout_pre_select_btr(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
-	size_t sz = btr_get_input_queue_size(sot->btrn);
+	int ret;
 
 	t->error = 0;
 	sot->check_fd = 0;
-	if (sz == 0) {
-		if (btr_no_parent(sot->btrn)) {
-			s->timeout.tv_sec = 0;
-			s->timeout.tv_usec = 1;
-		}
-		return;
+	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
+	if (ret > 0)
+		para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+	else if (ret < 0) {
+		s->timeout.tv_sec = 0;
+		s->timeout.tv_usec = 1;
 	}
-	sot->check_fd = 1;
-	para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
 }
 
 /**
@@ -100,32 +98,29 @@ static void stdout_post_select(struct sched *s, struct task *t)
 static void stdout_post_select_btr(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
-	ssize_t ret;
-	size_t sz = btr_get_input_queue_size(sot->btrn);
+	struct btr_node *btrn = sot->btrn;
+	int ret;
 	char *buf;
+	size_t sz;
 
 	t->error = 0;
-	if (!sot->check_fd) {
-		if (sz == 0 && btr_no_parent(sot->btrn)) {
-			t->error = -E_ORPHAN;
-			goto err;
-		}
+	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+	if (ret < 0)
+		goto err;
+	if (ret == 0)
 		return;
-	}
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
 		return;
-	sz = btr_next_buffer(sot->btrn, &buf);
-	if (sz == 0)
-		return;
+	sz = btr_next_buffer(btrn, &buf);
+	assert(sz > 0);
 	ret = write_nonblock(STDOUT_FILENO, buf, sz, 0);
-	if (ret < 0) {
-		t->error = -ERRNO_TO_PARA_ERROR(errno);
+	if (ret < 0)
 		goto err;
-	}
-	btr_consume(sot->btrn, ret);
+	btr_consume(btrn, ret);
 	return;
 err:
-	btr_del_node(sot->btrn);
+	btr_remove_node(btrn);
+	t->error = ret;
 }
 /**
  * Initialize a stdout task structure with default values.