X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=20b9250e9b7fbf3c252e20dff8891bfeeb5112dd;hp=08bc1f9a4be9c2964ae1c882cf6e34cd11685a19;hb=9bb2e6ed4206247fdee844c0a1f3326e85a7ab59;hpb=b99b4ac94a4391f5a6bbeb9b8ba5eb466eca6249 diff --git a/stdin.c b/stdin.c index 08bc1f9a..20b9250e 100644 --- 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; if (sit->must_set_nonblock_flag) { ret = mark_fd_nonblocking(STDIN_FILENO); if (ret < 0) @@ -87,13 +85,13 @@ 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); /* Revert to blocking mode if necessary. */ fcntl(STDIN_FILENO, F_SETFL, sit->fd_flags); //btr_pool_free(sit->btrp); - t->error = ret; + return ret; } /**