X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=92707ba97b86624b543c7fbaedea74b5ace7a6c3;hp=d64586bccd9cdd12ffe743247680d8686ee1c002;hb=6e83b4bcdf55b8daa551a57923fe9bb01c870325;hpb=11e68b8de3eb8bf8b657333d5b8359260559e93b

diff --git a/stdout.c b/stdout.c
index d64586bc..92707ba9 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,12 +1,11 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file stdout.c Functions that deal with writing to stdout. */
 
-#include <dirent.h> /* readdir() */
 #include <assert.h>
 
 #include "para.h"
@@ -15,6 +14,7 @@
 #include "fd.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
 /**
  * The pre_select function of the stdout task.
@@ -22,25 +22,19 @@
  * \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);
+	int ret;
 
-	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);
+	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)
+		sched_min_delay(s);
 }
 
 /**
@@ -49,49 +43,55 @@ static void stdout_pre_select(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)
+static int stdout_post_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
-	ssize_t ret;
+	struct btr_node *btrn = sot->btrn;
+	int ret;
+	char *buf;
+	size_t sz;
 
-	t->error = 0;
-	if (!sot->check_fd) {
-		if (!*sot->loaded && *sot->input_error < 0)
-			t->error = *sot->input_error;
-		return;
-	}
+	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+	if (ret < 0)
+		goto out;
+	if (ret == 0)
+		return 0;
 	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;
+		return 0;
+
+	for (;;) {
+		sz = btr_next_buffer(btrn, &buf);
+		if (sz == 0)
+			break;
+		ret = xwrite(STDOUT_FILENO, buf, sz);
+		if (ret <= 0)
+			break;
+		btr_consume(btrn, ret);
 	}
-	*sot->loaded -= ret;
-	if (*sot->loaded)
-		memmove(*sot->bufp, *sot->bufp + ret, *sot->loaded);
+out:
+	if (ret < 0)
+		btr_remove_node(&sot->btrn);
+	return ret;
 }
-
 /**
  * Initialize a stdout task structure with default values.
  *
  * \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;
 
 	sot->task.pre_select = stdout_pre_select;
-	sot->task.post_select = stdout_post_select;
-	sprintf(sot->task.status, "stdout writer");
+	sot->task.new_post_select = stdout_post_select;
+	sot->task.post_select = NULL;
+	sprintf(sot->task.status, "stdout");
 	ret = mark_fd_nonblocking(STDOUT_FILENO);
 	if (ret >= 0)
 		return;