X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=stdin.c;h=868e1ed0e031744e1df39368ed241547e02fd836;hb=67ba58404e6187699c806bfe19a3e6a70faf9738;hp=cecdcb77521964b7303423f564d04117233a3d1b;hpb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3;p=paraslash.git

diff --git a/stdin.c b/stdin.c
index cecdcb77..868e1ed0 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,48 +1,167 @@
+/*
+ * Copyright (C) 2006-2009 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.
+ *
+ * \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.
+ */
+static void stdin_pre_select(struct sched *s, struct task *t)
+{
+	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;
+	sit->check_fd = 1;
+	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+}
 
-void stdin_pre_select(struct sched *s, struct task *t)
+static void stdin_pre_select_btr(struct sched *s, struct task *t)
 {
-	struct stdin_task *sit = t->private_data;
-	if (sit->loaded < sit->bufsize)
-		para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
-	t->ret = 1; /* success */
+	struct stdin_task *sit = container_of(t, struct stdin_task, task);
+	int ret;
+
+	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);
 }
 
-void stdin_post_select(struct sched *s, struct task *t)
+/**
+ * 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.
+ *
+ * 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.
+ */
+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->loaded >= sit->bufsize)
+	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 {
+		t->error = ERRNO_TO_PARA_ERROR(errno);
+	else if (ret > 0)
 		sit->loaded += ret;
-		t->ret = ret;
-	}
-	sprintf(t->status,
-		"%p stdin reader: loaded = %d, ret = %d",
-		sit, sit->loaded, t->ret);
+	else
+		t->error = -E_STDIN_EOF;
 }
 
-#if 0
-void stdin_init(struct stdin_task *sit)
+static void stdin_post_select_btr(struct sched *s, struct task *t)
 {
-	sit->task.private_data = sit;
-	sit->task.pre_select = stdin_pre_select;
-	sit->task.post_select = stdin_post_select;
-	sit->task.flags = POST_EOF_IS_ERROR;
-	sprintf(sit->task.status, "%p stdin reader: initialized", &sit->task);
+	struct stdin_task *sit = container_of(t, struct stdin_task, task);
+	ssize_t ret;
+	size_t sz;
+	char *buf = NULL;
+
+	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;
+	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)
+		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.
+ *
+ * \param sit The stdin task structure.
+ *
+ * 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 (but no buffer is allocated).
+ */
+void stdin_set_defaults(struct stdin_task *sit)
+{
+	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;
+		sit->btrp = btr_pool_new("stdin", 64 * 1024);
+	} 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);
 }
-#endif