X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=5604fced075f5c2b24b8df622c6e0ad5c3a320dc;hp=16e16465ad2d9671c6d9e818f10caed6aae2cb91;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=d8213149049056e0cabbcbe575a10dfb1a83583e;ds=sidebyside

diff --git a/stdout.c b/stdout.c
index 16e16465..5604fced 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,41 +24,20 @@
  * \param s The scheduler this task was registered to.
  * \param t The task structure of the stdout task.
  *
- * This function is always successful. If there is data available in the input
- * buffer, it adds \p STDOUT_FILENO to the write fd set of \a s.
+ * This function is always successful. If there is input data available, it
+ * adds \p STDOUT_FILENO to the write fd set of \a s.
  */
 static void stdout_pre_select(struct sched *s, struct task *t)
-{
-	struct stdout_task *sot = container_of(t, struct stdout_task, task);
-
-	t->error = 0;
-	sot->check_fd = 0;
-	if (!*sot->loaded) {
-		if (*sot->input_error < 0) {
-			t->error = *sot->input_error;
-			s->timeout.tv_sec = 0;
-			s->timeout.tv_usec = 1;
-		}
-		return;
-	}
-	sot->check_fd = 1;
-	para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
-}
-
-static void stdout_pre_select_btr(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
 	int ret;
 
 	t->error = 0;
-	sot->check_fd = 0;
 	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;
-	}
+	else if (ret < 0)
+		sched_min_delay(s);
 }
 
 /**
@@ -67,35 +46,10 @@ static void stdout_pre_select_btr(struct sched *s, struct task *t)
  * \param s The scheduler this task was registered to.
  * \param t The task structure of the stdout task.
  *
- * This function checks if \p STDOUT_FILENO was included by in the write fd set
- * of \a s during the previous pre_select call.  If yes, and \p STDOUT_FILENO
- * appeears to be writable, the data loaded in the input buffer is written to
- * stdout.
+ * This function writes input data from the buffer tree to stdout if \p
+ * STDOUT_FILENO is writable.
  */
 static void stdout_post_select(struct sched *s, struct task *t)
-{
-	struct stdout_task *sot = container_of(t, struct stdout_task, task);
-	ssize_t ret;
-
-	t->error = 0;
-	if (!sot->check_fd) {
-		if (!*sot->loaded && *sot->input_error < 0)
-			t->error = *sot->input_error;
-		return;
-	}
-	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
-		return;
-	ret = write(STDOUT_FILENO, *sot->bufp, *sot->loaded);
-	if (ret < 0) {
-		t->error = -ERRNO_TO_PARA_ERROR(errno);
-		return;
-	}
-	*sot->loaded -= ret;
-	if (*sot->loaded)
-		memmove(*sot->bufp, *sot->bufp + ret, *sot->loaded);
-}
-
-static void stdout_post_select_btr(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
 	struct btr_node *btrn = sot->btrn;
@@ -106,20 +60,24 @@ static void stdout_post_select_btr(struct sched *s, struct task *t)
 	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
 	if (ret < 0)
-		goto err;
+		goto out;
 	if (ret == 0)
 		return;
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
 		return;
-	sz = btr_next_buffer(btrn, &buf);
-	assert(sz > 0);
-	ret = write_nonblock(STDOUT_FILENO, buf, sz, 0);
+
+	for (;;) {
+		sz = btr_next_buffer(btrn, &buf);
+		if (sz == 0)
+			break;
+		ret = write_nonblock(STDOUT_FILENO, buf, sz);
+		if (ret <= 0)
+			break;
+		btr_consume(btrn, ret);
+	}
+out:
 	if (ret < 0)
-		goto err;
-	btr_consume(btrn, ret);
-	return;
-err:
-	btr_remove_node(btrn);
+		btr_remove_node(btrn);
 	t->error = ret;
 }
 /**
@@ -127,21 +85,16 @@ err:
  *
  * \param sot The stdout task structure.
  *
- * This fills in the pre/post select function poinzters of the task structure
- * given by \a sot.
+ * This fills in the pre/post select function pointers of the task structure
+ * given by \a sot and sets the stdout file descriptor to nonblocking mode.
  */
 void stdout_set_defaults(struct stdout_task *sot)
 {
 	int ret;
 
-	if (sot->btrn) {
-		sot->task.pre_select = stdout_pre_select_btr;
-		sot->task.post_select = stdout_post_select_btr;
-	} else {
-		sot->task.pre_select = stdout_pre_select;
-		sot->task.post_select = stdout_post_select;
-	}
-	sprintf(sot->task.status, "stdout writer");
+	sot->task.pre_select = stdout_pre_select;
+	sot->task.post_select = stdout_post_select;
+	sprintf(sot->task.status, "stdout");
 	ret = mark_fd_nonblocking(STDOUT_FILENO);
 	if (ret >= 0)
 		return;