X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=5b6bf520cb6b09f54e6dc30cb3f21c8d7118ba63;hp=4e567008dd1f2f7a3d98cf691a6ce04c2e5a7de1;hb=faccd246cf9ee662cd8262d0db2a2375c1d4da86;hpb=76939ad9d19a8e2895932734a5c9693e894acd15;ds=sidebyside

diff --git a/stdin.c b/stdin.c
index 4e567008..5b6bf520 100644
--- a/stdin.c
+++ b/stdin.c
@@ -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,12 +39,6 @@ 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.
  *
@@ -53,29 +47,26 @@ static void stdin_default_event_handler(struct task *t)
  *
  * 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,22 +74,17 @@ 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;
 	sprintf(sit->task.status, "stdin reader");
 	ret = mark_fd_nonblocking(STDIN_FILENO);
 	if (ret >= 0)