X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=c8ee808fcb539611fb1e40cddc9c0c189fa95d50;hp=facbf47395fae85b3396197118e6edf68a6cf90c;hb=c5cbf3fc1fb7a76ab48424581b5c212e1b66f9e4;hpb=f45846b1a228c806424e6bf937ba09e648e87441

diff --git a/stdin.c b/stdin.c
index facbf473..c8ee808f 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,15 +8,17 @@
 
 #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,6 +33,11 @@
 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)
@@ -39,6 +46,27 @@ static void stdin_pre_select(struct sched *s, struct task *t)
 	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
 }
 
+#define STDIN_MAX_PENDING (100 * 1024)
+
+static void stdin_pre_select_btr(struct sched *s, struct 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.
  *
@@ -55,6 +83,10 @@ 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;
 
+	if (sit->output_error && *sit->output_error < 0) {
+		t->error = *sit->output_error;
+		return;
+	}
 	t->error = 0;
 	if (!sit->check_fd)
 		return;
@@ -69,28 +101,66 @@ static void stdin_post_select(struct sched *s, struct task *t)
 		t->error = -E_STDIN_EOF;
 }
 
+#define STDIN_INPUT_BUFFER_SIZE (1024 * 32)
+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.
  *
  * \param sit The stdin task structure.
  *
  * This fills in the pre/post select function pointers of the task structure
- * given by \a sit. 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).
+ * 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->task.pre_select = stdin_pre_select;
-	sit->task.post_select = stdin_post_select;
+	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);
 }