X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=5b6bf520cb6b09f54e6dc30cb3f21c8d7118ba63;hp=40f02c1cef0a945546966fef4f2cea033d54fc17;hb=d27b31524e1d60ad4fdbeb606bba31ba0ee54048;hpb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;ds=sidebyside

diff --git a/stdin.c b/stdin.c
index 40f02c1c..5b6bf520 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 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 */
+/** \file stdin.c Functions that deal with reading from stdin. */
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>
@@ -19,10 +19,10 @@
 #include "stdin.h"
 
 /**
- * the pre_select function of the stdin task
+ * 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
+ * \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
@@ -30,8 +30,8 @@
  */
 static void stdin_pre_select(struct sched *s, struct task *t)
 {
-	struct stdin_task *sit = t->private_data;
-	t->ret = 1;
+	struct stdin_task *sit = container_of(t, struct stdin_task, task);
+	t->error = 0;
 	sit->check_fd = 0;
 	if (sit->loaded >= sit->bufsize)
 		return;
@@ -39,43 +39,34 @@ static void stdin_pre_select(struct sched *s, struct task *t)
 	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
 }
 
-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
+ * 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
+ * \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
+ * appears 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;
+	struct stdin_task *sit = container_of(t, struct stdin_task, task);
 	ssize_t ret;
 
-	t->ret = 1;
+	t->error = 0;
 	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 if (ret > 0) {
+		t->error = ERRNO_TO_PARA_ERROR(errno);
+	else if (ret > 0)
 		sit->loaded += ret;
-		t->ret = ret;
-	} else
-		t->ret = -E_STDIN_EOF;
-	if (t->ret < 0)
-		sit->error = t->ret;
+	else
+		t->error = -E_STDIN_EOF;
 }
 
 /**
@@ -83,20 +74,21 @@ static void stdin_post_select(struct sched *s, struct task *t)
  *
  * \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).
+ * This fills in the pre/post select function pointers of the task structure
+ * given by \a sit. Moreover, the stdin file desctiptor is set to nonblocking
+ * mode and \a bufsize is initialized to 16 KB (but no buffer is allocated).
  */
 void stdin_set_defaults(struct stdin_task *sit)
 {
+	int ret;
+
 	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.event_handler = stdin_default_event_handler;
-	sit->task.private_data = sit;
-	mark_fd_nonblocking(STDIN_FILENO);
 	sprintf(sit->task.status, "stdin reader");
+	ret = mark_fd_nonblocking(STDIN_FILENO);
+	if (ret >= 0)
+		return;
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+	exit(EXIT_FAILURE);
 }