X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=d978ee9a23cc7fe6f47eab17e7f46ac78032ceaf;hp=83ff48f50acf38a95c2f0b021a04edf48675c73c;hb=c87045a40b9462ebeb28cc169d7bb3721c9a81d3;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a diff --git a/stdin.c b/stdin.c index 83ff48f5..d978ee9a 100644 --- a/stdin.c +++ b/stdin.c @@ -1,37 +1,44 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * 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 +#include #include "para.h" -#include "string.h" #include "list.h" #include "sched.h" #include "fd.h" #include "error.h" #include "stdin.h" +#include "buffer_tree.h" +#include "string.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; @@ -39,64 +46,121 @@ 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) +#define STDIN_MAX_PENDING (100 * 1024) + +static void stdin_pre_select_btr(struct sched *s, struct task *t) { - PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret)); - unregister_task(t); + struct stdin_task *sit = container_of(t, struct stdin_task, task); + + if (btr_no_children(sit->btrn)) { /* TODO: defer node deletion to post select */ + t->error = -E_STDIN_NO_CHILD; + btr_del_node(sit->btrn); + sit->btrn = NULL; + return; + } + t->error = 0; + if (btr_bytes_pending(sit->btrn) > STDIN_MAX_PENDING) + sit->check_fd = 0; + else { + sit->check_fd = 1; + para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno); + } } /** - * 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; +} + +#define STDIN_INPUT_BUFFER_SIZE 4000 +static void stdin_post_select_btr(struct sched *s, struct task *t) +{ + struct stdin_task *sit = container_of(t, struct stdin_task, task); + ssize_t ret; + char *buf = NULL; + + t->error = -E_STDIN_NO_CHILD; + if (btr_no_children(sit->btrn)) + goto err; + + t->error = 0; + if (!sit->check_fd) + return; + if (!FD_ISSET(STDIN_FILENO, &s->rfds)) + return; + + buf = para_malloc(STDIN_INPUT_BUFFER_SIZE); + ret = read(STDIN_FILENO, buf, STDIN_INPUT_BUFFER_SIZE); + //PARA_CRIT_LOG("read ret: %d\n", ret); + if (ret < 0) + t->error = -ERRNO_TO_PARA_ERROR(errno); + if (ret == 0) + t->error = -E_STDIN_EOF; + if (t->error < 0) + goto err; + btr_add_output(buf, ret, sit->btrn); + return; +err: + free(buf); + btr_del_node(sit->btrn); + sit->btrn = NULL; } /** - * 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) { - 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); + int ret; + + sit->bufsize = 32 * 1024; + if (sit->btrn) { + sit->task.pre_select = stdin_pre_select_btr; + sit->task.post_select = stdin_post_select_btr; + } else { + sit->task.pre_select = stdin_pre_select; + sit->task.post_select = stdin_post_select; + } 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); }