From: Andre Noll Date: Sun, 31 Mar 2013 18:24:32 +0000 (+0000) Subject: stdout: Switch to the alternative post select method. X-Git-Tag: v0.4.13~39^2~8 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=6e83b4bcdf55b8daa551a57923fe9bb01c870325;ds=sidebyside stdout: Switch to the alternative post select method. --- diff --git a/stdout.c b/stdout.c index 9c7e64e7..92707ba9 100644 --- a/stdout.c +++ b/stdout.c @@ -30,7 +30,6 @@ static void stdout_pre_select(struct sched *s, struct task *t) struct stdout_task *sot = container_of(t, struct stdout_task, task); int ret; - t->error = 0; ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF); if (ret > 0) para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno); @@ -47,7 +46,7 @@ static void stdout_pre_select(struct sched *s, struct task *t) * This function writes input data from the buffer tree to stdout if \p * STDOUT_FILENO is writable. */ -static void stdout_post_select(struct sched *s, struct task *t) +static int stdout_post_select(struct sched *s, struct task *t) { struct stdout_task *sot = container_of(t, struct stdout_task, task); struct btr_node *btrn = sot->btrn; @@ -55,14 +54,13 @@ static void stdout_post_select(struct sched *s, struct task *t) char *buf; size_t sz; - t->error = 0; ret = btr_node_status(btrn, 0, BTR_NT_LEAF); if (ret < 0) goto out; if (ret == 0) - return; + return 0; if (!FD_ISSET(STDOUT_FILENO, &s->wfds)) - return; + return 0; for (;;) { sz = btr_next_buffer(btrn, &buf); @@ -76,7 +74,7 @@ static void stdout_post_select(struct sched *s, struct task *t) out: if (ret < 0) btr_remove_node(&sot->btrn); - t->error = ret; + return ret; } /** * Initialize a stdout task structure with default values. @@ -91,7 +89,8 @@ void stdout_set_defaults(struct stdout_task *sot) int ret; sot->task.pre_select = stdout_pre_select; - sot->task.post_select = stdout_post_select; + sot->task.new_post_select = stdout_post_select; + sot->task.post_select = NULL; sprintf(sot->task.status, "stdout"); ret = mark_fd_nonblocking(STDOUT_FILENO); if (ret >= 0)