Simplify the scheduling code.

[paraslash.git] / stdin.c

diff --git a/stdin.c b/stdin.c
index 25eca2ef224f312a1249493d2bc9b192ce066d76..438883a76f5925d32a2e04810049902386019fce 100644 (file)
--- 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.
  */
 
  *
  * 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>
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>


@@ -19,10 +19,10 @@
 #include "stdin.h"
 
 /**
 #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
  *
  * 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)
 {
  */
 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;
        sit->check_fd = 0;
        if (sit->loaded >= sit->bufsize)
                return;


@@ -39,17 +39,11 @@ static void stdin_pre_select(struct sched *s, struct task *t)
        para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
 }
 
        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
  *
  * 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


@@ -58,24 +52,21 @@ static void stdin_default_event_handler(struct task *t)
  */
 static void stdin_post_select(struct sched *s, 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;
 
        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)
        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;
                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;

 }
 
 /**
 }
 
 /**


@@ -90,13 +81,16 @@ static void stdin_post_select(struct sched *s, struct task *t)
  */
 void stdin_set_defaults(struct stdin_task *sit)
 {
  */
 void stdin_set_defaults(struct stdin_task *sit)
 {

+       int ret;
+

        sit->bufsize = 16 * 1024,
        sit->loaded = 0,
        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.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");
        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);

 }
 }