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

diff --git a/stdin.c b/stdin.c
index c8ee808f..e625f372 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -33,38 +33,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)
-		return;
-	sit->check_fd = 1;
-	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;
+	ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
+	if (ret < 0)
+		sched_min_delay(s);
+	if (ret <= 0)
 		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);
-	}
+	if (btr_pool_unused(sit->btrp) > 0)
+		return para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+	sched_request_timeout_ms(100, s);
 }
 
 /**
@@ -75,64 +54,40 @@ static void stdin_pre_select_btr(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)
-		return;
-	if (!FD_ISSET(STDIN_FILENO, &s->rfds))
-		return;
-	ret = read(STDIN_FILENO, sit->buf + sit->loaded, sit->bufsize - sit->loaded);
+	ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
 	if (ret < 0)
-		t->error = ERRNO_TO_PARA_ERROR(errno);
-	else if (ret > 0)
-		sit->loaded += ret;
-	else
-		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)
+	if (ret == 0)
 		return;
-	if (!FD_ISSET(STDIN_FILENO, &s->rfds))
+	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_nonblock(STDIN_FILENO, buf, sz, &s->rfds, &n);
+	if (n > 0)
+		btr_add_output_pool(sit->btrp, n, sit->btrn);
+	if (ret >= 0)
 		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;
+	btr_remove_node(sit->btrn);
+	//btr_pool_free(sit->btrp);
+	t->error = ret;
 }
 
 /**
@@ -142,25 +97,19 @@ err:
  *
  * 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;
-	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;
-	}
+	sit->task.pre_select = stdin_pre_select;
+	sit->task.post_select = stdin_post_select;
+	sit->btrp = btr_pool_new("stdin", 64 * 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);
 }