Simplify the scheduling code.
[paraslash.git] / stdin.c
diff --git a/stdin.c b/stdin.c
index 4e56700..438883a 100644 (file)
--- 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.
  *
@@ -58,24 +52,21 @@ static void stdin_default_event_handler(struct task *t)
  */
 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;
 }
 
 /**
@@ -94,11 +85,8 @@ void stdin_set_defaults(struct stdin_task *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.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)