X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=4329e144a04ae2921a710bd28a3faae710f6b17f;hp=8eb86dee69ba7322524e960bba6169916e9bef14;hb=6d92af64de5e78ded1a7cb27a88d7e10c9f576a8;hpb=3ddbf5db98280cb09ef74726573b0b3f3b7e62d6

diff --git a/stdin.c b/stdin.c
index 8eb86dee..4329e144 100644
--- a/stdin.c
+++ b/stdin.c
@@ -8,6 +8,8 @@
 
 #include <dirent.h> /* readdir() */
 #include <assert.h>
+#include <stdbool.h>
+#include <regex.h>
 
 #include "para.h"
 #include "list.h"
@@ -15,6 +17,8 @@
 #include "fd.h"
 #include "error.h"
 #include "stdin.h"
+#include "buffer_tree.h"
+#include "string.h"
 
 /**
  * The pre_select function of the stdin task.
@@ -42,6 +46,21 @@ static void stdin_pre_select(struct sched *s, struct task *t)
 	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
 }
 
+static void stdin_pre_select_btr(struct sched *s, struct task *t)
+{
+	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)
+		para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+	else if (ret < 0) {
+		s->timeout.tv_sec = 0;
+		s->timeout.tv_usec = 1;
+	}
+}
+
 /**
  * The post select function of the stdin task.
  *
@@ -76,6 +95,47 @@ static void stdin_post_select(struct sched *s, struct task *t)
 		t->error = -E_STDIN_EOF;
 }
 
+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;
+	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);
+	ret = -E_STDIN_OVERRUN;
+	if (sz == 0)
+		goto err;
+	/*
+	 * 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);
+	//PARA_CRIT_LOG("read ret: %d\n", ret);
+	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.
  *
@@ -83,15 +143,21 @@ 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 bufsize is initialized (but no buffer is allocated).
  */
 void stdin_set_defaults(struct stdin_task *sit)
 {
 	int ret;
 
-	sit->bufsize = 16 * 1024,
-	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;
+		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)