/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
*
- * 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 <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
+ * 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;
- sit->check_fd = 0;
- if (sit->loaded >= sit->bufsize)
- return;
- sit->check_fd = 1;
- para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
-}
+ struct stdin_task *sit = container_of(t, struct stdin_task, task);
+ int ret;
-static void stdin_default_event_handler(struct task *t)
-{
- PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret));
- unregister_task(t);
+ t->error = 0;
+ ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
+ if (ret < 0)
+ sched_min_delay(s);
+ if (ret <= 0)
+ return;
+ if (btr_pool_unused(sit->btrp) > 0)
+ return para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+ sched_request_timeout_ms(100, s);
}
/**
- * 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
- * stdin task.
+ * appears to be readable, data is read from stdin and fed into the buffer
+ * tree.
*/
-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;
+ size_t sz;
+ char *buf = NULL;
- t->ret = 1;
- if (!sit->check_fd)
+ t->error = 0;
+ 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))
return;
- ret = read(STDIN_FILENO, sit->buf + sit->loaded, sit->bufsize - sit->loaded);
+ sz = btr_pool_get_buffer(sit->btrp, &buf);
+ if (sz == 0)
+ return;
+ /*
+ * 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(STDIN_FILENO, buf, sz);
if (ret < 0)
- t->ret = -E_STDIN_READ;
- else if (ret > 0) {
- sit->loaded += ret;
- t->ret = ret;
- } else
- t->ret = -E_STDIN_EOF;
- if (t->ret < 0)
- sit->eof = 1;
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ if (ret == 0)
+ ret = -E_STDIN_EOF;
+ if (ret < 0)
+ goto err;
+ btr_add_output_pool(sit->btrp, ret, sit->btrn);
+ return;
+err:
+ btr_remove_node(sit->btrn);
+ //btr_pool_free(sit->btrp);
+ t->error = ret;
}
/**
- * 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 buffer tree is created.
*/
void stdin_set_defaults(struct stdin_task *sit)
{
- sit->bufsize = 16 * 1024,
- sit->loaded = 0,
- sit->eof = 0,
+ int ret;
+
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);
+ sit->btrp = btr_pool_new("stdin", 64 * 1024);
sprintf(sit->task.status, "stdin reader");
+ ret = mark_fd_nonblocking(STDIN_FILENO);
+ if (ret >= 0)
+ return;
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
}
projects / paraslash.git / blobdiff