X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=40f02c1cef0a945546966fef4f2cea033d54fc17;hp=cecdcb77521964b7303423f564d04117233a3d1b;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3

diff --git a/stdin.c b/stdin.c
index cecdcb77..40f02c1c 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,3 +1,15 @@
+/*
+ * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file stdin.c functions that deal with reading from stdin */
+
+#include <dirent.h> /* readdir() */
+#include <assert.h>
+
+
 #include "para.h"
 #include "string.h"
 #include "list.h"
@@ -6,43 +18,85 @@
 #include "error.h"
 #include "stdin.h"
 
-void stdin_pre_select(struct sched *s, struct task *t)
+/**
+ * the pre_select function of the stdin task
+ *
+ * \param s the scheduler this task was registered to
+ * \param t the task structure of the stdin task
+ *
+ * This function is always successful. If there is space left in the
+ * buffer of the stdin task, it adds \p STDIN_FILENO to the read fd set
+ * of \a s.
+ */
+static void stdin_pre_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = t->private_data;
-	if (sit->loaded < sit->bufsize)
-		para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
-	t->ret = 1; /* success */
+	t->ret = 1;
+	sit->check_fd = 0;
+	if (sit->loaded >= sit->bufsize)
+		return;
+	sit->check_fd = 1;
+	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
 }
 
-void stdin_post_select(struct sched *s, struct task *t)
+static void stdin_default_event_handler(struct task *t)
+{
+	PARA_NOTICE_LOG("%p: %s\n", t, para_strerror(-t->ret));
+	unregister_task(t);
+}
+
+/**
+ * the post select function of the stdin task
+ *
+ * \param s the scheduler this task was registered to
+ * \param t the task structure of the stdin task
+ *
+ * This function checks if \p STDIN_FILENO was included by in the read fd set
+ * of \a s during the previous pre_select call.  If yes, and \p STDIN_FILENO
+ * appeears to be readable, data is read from stdin into the buffer of the
+ * stdin task.
+ */
+static void stdin_post_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = t->private_data;
 	ssize_t ret;
 
 	t->ret = 1;
-	if (sit->loaded >= sit->bufsize)
+	if (!sit->check_fd)
 		return;
 	if (!FD_ISSET(STDIN_FILENO, &s->rfds))
 		return;
 	ret = read(STDIN_FILENO, sit->buf + sit->loaded, sit->bufsize - sit->loaded);
 	if (ret < 0)
 		t->ret = -E_STDIN_READ;
-	else {
+	else if (ret > 0) {
 		sit->loaded += ret;
 		t->ret = ret;
-	}
-	sprintf(t->status,
-		"%p stdin reader: loaded = %d, ret = %d",
-		sit, sit->loaded, t->ret);
+	} else
+		t->ret = -E_STDIN_EOF;
+	if (t->ret < 0)
+		sit->error = t->ret;
 }
 
-#if 0
-void stdin_init(struct stdin_task *sit)
+/**
+ * Initialize a stdin task structure with default values.
+ *
+ * \param sit The stdin task structure.
+ *
+ * This fills in the pre/post select function poinzters of the task structure
+ * given by \a sit. It also sets up a default error handler which unregisters
+ * the task. Moreover, \a loaded and \a eof are set to zero and \a bufsize is
+ * initialized to 16 KB (but no buffer is allocated).
+ */
+void stdin_set_defaults(struct stdin_task *sit)
 {
-	sit->task.private_data = sit;
+	sit->bufsize = 16 * 1024,
+	sit->loaded = 0,
+	sit->error = 0,
 	sit->task.pre_select = stdin_pre_select;
 	sit->task.post_select = stdin_post_select;
-	sit->task.flags = POST_EOF_IS_ERROR;
-	sprintf(sit->task.status, "%p stdin reader: initialized", &sit->task);
+	sit->task.event_handler = stdin_default_event_handler;
+	sit->task.private_data = sit;
+	mark_fd_nonblocking(STDIN_FILENO);
+	sprintf(sit->task.status, "stdin reader");
 }
-#endif