X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=5604fced075f5c2b24b8df622c6e0ad5c3a320dc;hp=84f2f7cacd3935fd1f60245ff171cbd9f986607d;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/stdout.c b/stdout.c
index 84f2f7ca..5604fced 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,102 +1,103 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 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 */
+/** \file stdout.c Functions that deal with writing to stdout. */
+
+#include <dirent.h> /* readdir() */
+#include <assert.h>
+#include <stdbool.h>
 
 #include "para.h"
-#include "string.h"
 #include "list.h"
 #include "sched.h"
 #include "fd.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
 /**
- * the pre_select function of the stdout task
+ * The pre_select function of the stdout task.
  *
- * \param s the scheduler this task was registered to
- * \param t the task structure of the stdout task
+ * \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.
  */
-void stdout_pre_select(struct sched *s, struct task *t)
+static void stdout_pre_select(struct sched *s, struct task *t)
 {
-	struct stdout_task *sot = t->private_data;
+	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	int ret;
 
-	t->ret = 1;
-	sot->check_fd = 0;
-	if (!*sot->loaded) {
-		if (*sot->input_eof) {
-			t->ret = -E_STDOUT_EOF;
-			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);
+	t->error = 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)
+		sched_min_delay(s);
 }
 
 /**
- * the post select function of the stdout task
+ * The post select function of the stdout task.
  *
- * \param s the scheduler this task was registered to
- * \param t the task structure of the stdout task
+ * \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.
  */
-void stdout_post_select(struct sched *s, struct task *t)
+static void stdout_post_select(struct sched *s, struct task *t)
 {
-	struct stdout_task *sot = t->private_data;
-	ssize_t ret;
+	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	struct btr_node *btrn = sot->btrn;
+	int ret;
+	char *buf;
+	size_t sz;
 
-	t->ret = 1;
-	if (!sot->check_fd) {
-		if (*sot->input_eof)
-			t->ret = -E_STDOUT_EOF;
+	t->error = 0;
+	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+	if (ret < 0)
+		goto out;
+	if (ret == 0)
 		return;
-	}
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
 		return;
-	t->ret = -E_STDOUT_WRITE;
-	ret = write(STDOUT_FILENO, sot->buf, *sot->loaded);
-	if (ret <= 0)
-		return;
-	*sot->loaded -= ret;
-	if (*sot->loaded)
-		memmove(sot->buf, sot->buf + ret, *sot->loaded);
-	t->ret = 1;
-}
 
-static void stdout_default_event_handler(struct task *t)
-{
-	PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret));
-	unregister_task(t);
+	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)
+		btr_remove_node(btrn);
+	t->error = ret;
 }
-
 /**
- * initialize a stdout task structure with default values
+ * Initialize a stdout task structure with default values.
  *
- * \param sot the stdout task structure
+ * \param sot The stdout task structure.
  *
- * This fills in the pre/post select function poinzters of the task structure
- * given by \a sot. It also sets up a default error handler which unregisters
- * the task on errors and clears the eof flag of \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)
 {
-	sot->task.private_data = sot;
+	int ret;
+
 	sot->task.pre_select = stdout_pre_select;
 	sot->task.post_select = stdout_post_select;
-	sot->task.event_handler = stdout_default_event_handler;
-	sot->eof = 0;
-	mark_fd_nonblock(STDOUT_FILENO);
-	sprintf(sot->task.status, "stdout writer");
+	sprintf(sot->task.status, "stdout");
+	ret = mark_fd_nonblocking(STDOUT_FILENO);
+	if (ret >= 0)
+		return;
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+	exit(EXIT_FAILURE);
 }