X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=f39de1090c146acd8f10578b18d637e137a4379a;hp=83703055c83c54edc9a7e17b050f3ca2d076c61e;hb=518a2727540cf5e105d28aa8fd31bb6afad05bf6;hpb=39ef1da5509461b18beb5b8f16ff6118c20c0ac6;ds=inline

diff --git a/stdout.c b/stdout.c
index 83703055..f39de109 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,3 +1,14 @@
+/*
+ * Copyright (C) 2006 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"
 #include "string.h"
 #include "list.h"
@@ -6,26 +17,52 @@
 #include "error.h"
 #include "stdout.h"
 
-void stdout_pre_select(struct sched *s, struct task *t)
+/**
+ * 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
+ *
+ * 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.
+ */
+static void stdout_pre_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = t->private_data;
 
 	t->ret = 1;
 	sot->check_fd = 0;
-	if (!*sot->loaded)
+	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);
 }
 
-void stdout_post_select(struct sched *s, struct task *t)
+/**
+ * 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
+ *
+ * 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.
+ */
+static void stdout_post_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = t->private_data;
 	ssize_t ret;
 
 	t->ret = 1;
 	if (!sot->check_fd) {
-		if (*sot->eof)
+		if (*sot->input_eof)
 			t->ret = -E_STDOUT_EOF;
 		return;
 	}
@@ -36,5 +73,33 @@ void stdout_post_select(struct sched *s, struct task *t)
 	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);
+}
+
+/**
+ * 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. It also sets up a default error handler which unregisters
+ * the task on errors and clears the eof flag of \a sot.
+ */
+void stdout_set_defaults(struct stdout_task *sot)
+{
+	sot->task.private_data = sot;
+	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");
+}