the paraslash-0.4.9 release tarball

[paraslash.git] / stdin.c

diff --git a/stdin.c b/stdin.c
index c683b56073ae05c0b057b2b1909be220f7b066ad..c4ab323d488da7dc4e1aa1b6fc05af9e88b4b717 100644 (file)
--- a/stdin.c
+++ b/stdin.c
@@ -1,22 +1,23 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file stdin.c Functions that deal with reading from stdin. */
 
-#include <dirent.h> /* readdir() */
 #include <assert.h>
-
+#include <stdbool.h>
+#include <regex.h>
 
 #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.
@@ -31,17 +32,17 @@
 static void stdin_pre_select(struct sched *s, struct task *t)
 {
        struct stdin_task *sit = container_of(t, struct stdin_task, task);
+       int ret;
 
-       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)
+       ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
+       if (ret < 0)
+               sched_min_delay(s);
+       if (ret <= 0)
                return;
-       sit->check_fd = 1;
-       para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+       if (btr_pool_unused(sit->btrp) > 0)
+               return para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+       sched_request_timeout_ms(100, s);
 }
 
 /**
@@ -52,30 +53,40 @@ static void stdin_pre_select(struct sched *s, struct task *t)
  *
  * 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
- * appears to be readable, data is read from stdin into the buffer of the
- * stdin task.
+ * 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)
 {
        struct stdin_task *sit = container_of(t, struct stdin_task, task);
        ssize_t ret;
+       size_t sz, n;
+       char *buf = NULL;
 
-       if (sit->output_error && *sit->output_error < 0) {
-               t->error = *sit->output_error;
-               return;
-       }
        t->error = 0;
-       if (!sit->check_fd)
+       ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
+       if (ret < 0)
+               goto err;
+       if (ret == 0)
                return;
-       if (!FD_ISSET(STDIN_FILENO, &s->rfds))
+       sz = btr_pool_get_buffer(sit->btrp, &buf);
+       if (sz == 0)
                return;
-       ret = read(STDIN_FILENO, sit->buf + sit->loaded, sit->bufsize - sit->loaded);
-       if (ret < 0)
-               t->error = ERRNO_TO_PARA_ERROR(errno);
-       else if (ret > 0)
-               sit->loaded += ret;
-       else
-               t->error = -E_STDIN_EOF;
+       /*
+        * 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
+        * reference can not be freed, we're stuck.
+        */
+       sz = PARA_MIN(sz, btr_pool_size(sit->btrp) / 2);
+       ret = read_nonblock(STDIN_FILENO, buf, sz, &s->rfds, &n);
+       if (n > 0)
+               btr_add_output_pool(sit->btrp, n, sit->btrn);
+       if (ret >= 0)
+               return;
+err:
+       btr_remove_node(sit->btrn);
+       //btr_pool_free(sit->btrp);
+       t->error = ret;
 }
 
 /**
@@ -85,20 +96,19 @@ static void stdin_post_select(struct sched *s, struct task *t)
  *
  * 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).
+ * mode, and a buffer tree is created.
  */
 void stdin_set_defaults(struct stdin_task *sit)
 {
        int ret;
 
-       sit->bufsize = 32 * 1024,
        sit->task.pre_select = stdin_pre_select;
        sit->task.post_select = stdin_post_select;
+       sit->btrp = btr_pool_new("stdin", 128 * 1024);
        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);
 }