X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=fea30dd90ca0e493bb6f4ce54f1515ea072761dc;hp=8b18c2e2cef6c54975cde07285fd68207334d63b;hb=74361f472d6d1a75a313cb3a6b4528cfeacfff0a;hpb=27638103f249ffbe9768603b9baff199950fd9f6 diff --git a/stdin.c b/stdin.c index 8b18c2e2..fea30dd9 100644 --- a/stdin.c +++ b/stdin.c @@ -1,22 +1,14 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * 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 /* readdir() */ +#include + #include "para.h" #include "string.h" @@ -27,19 +19,24 @@ #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 * of \a s. */ -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); + + if (sit->output_error && *sit->output_error < 0) { + t->error = *sit->output_error; + return; + } + t->error = 0; sit->check_fd = 0; if (sit->loaded >= sit->bufsize) return; @@ -47,64 +44,61 @@ 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 + * 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 - * appeears to be readable, data is read from stdin into the buffer of the + * appears to be readable, data is read from stdin into the buffer of the * stdin task. */ -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; - t->ret = 1; + if (sit->output_error && *sit->output_error < 0) { + t->error = *sit->output_error; + return; + } + 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->eof = 1; + else + t->error = -E_STDIN_EOF; } /** - * initialize a stdin task structure with default values + * Initialize a stdin task structure with default values. * - * \param sit the stdin task structure + * \param sit The stdin task structure. * - * This fills in the pre/post select function poinzters of the task structure - * given by \a sot. It also sets up a default error handler which unregisters - * the task. Moreover, \a loaded and \a eof are set to zero and \a bufsize is - * initialized to 16 KB (but no buffer is allocated). + * This fills in the pre/post select function pointers of the task structure + * given by \a sit. Moreover, the stdin file desctiptor is set to nonblocking + * mode and \a bufsize is initialized to 16 KB (but no buffer is allocated). */ void stdin_set_defaults(struct stdin_task *sit) { + int ret; + sit->bufsize = 16 * 1024, - sit->loaded = 0, - sit->eof = 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; - mark_fd_nonblock(STDIN_FILENO); sprintf(sit->task.status, "stdin reader"); + ret = mark_fd_nonblocking(STDIN_FILENO); + if (ret >= 0) + return; + sit->output_error = NULL; + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); }