stdin: Switch to the alternative post select method.
authorAndre Noll <maan@systemlinux.org>
Sun, 31 Mar 2013 18:22:08 +0000 (18:22 +0000)
committerAndre Noll <maan@systemlinux.org>
Tue, 30 Apr 2013 12:12:46 +0000 (14:12 +0200)
stdin.c

diff --git a/stdin.c b/stdin.c
index fd803ae..b52123d 100644 (file)
--- a/stdin.c
+++ b/stdin.c
@@ -33,7 +33,6 @@ static void stdin_pre_select(struct sched *s, struct task *t)
        struct stdin_task *sit = container_of(t, struct stdin_task, task);
        int ret;
 
-       t->error = 0;
        ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
        if (ret < 0)
                sched_min_delay(s);
@@ -55,22 +54,21 @@ static void stdin_pre_select(struct sched *s, struct task *t)
  * appears to be readable, data is read from stdin and fed into the buffer
  * tree.
  */
-static void stdin_post_select(struct sched *s, struct task *t)
+static int stdin_post_select(struct sched *s, struct task *t)
 {
        struct stdin_task *sit = container_of(t, struct stdin_task, task);
        ssize_t ret;
        size_t sz, n;
        char *buf = NULL;
 
-       t->error = 0;
        ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
        if (ret < 0)
                goto err;
        if (ret == 0)
-               return;
+               return 0;
        sz = btr_pool_get_buffer(sit->btrp, &buf);
        if (sz == 0)
-               return;
+               return 0;
        /*
         * Do not use the maximal size to avoid having only a single buffer
         * reference for the whole pool. This is bad because if that single
@@ -81,11 +79,11 @@ static void stdin_post_select(struct sched *s, struct task *t)
        if (n > 0)
                btr_add_output_pool(sit->btrp, n, sit->btrn);
        if (ret >= 0)
-               return;
+               return 0;
 err:
        btr_remove_node(&sit->btrn);
        //btr_pool_free(sit->btrp);
-       t->error = ret;
+       return ret;
 }
 
 /**
@@ -102,7 +100,8 @@ void stdin_set_defaults(struct stdin_task *sit)
        int ret;
 
        sit->task.pre_select = stdin_pre_select;
-       sit->task.post_select = stdin_post_select;
+       sit->task.new_post_select = stdin_post_select;
+       sit->task.post_select = NULL;
        sit->btrp = btr_pool_new("stdin", 128 * 1024);
        sprintf(sit->task.status, "stdin reader");
        ret = mark_fd_nonblocking(STDIN_FILENO);