X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=stdin.c;h=4329e144a04ae2921a710bd28a3faae710f6b17f;hb=7991d2871340f773ad7d0e819491fe905b184a5c;hp=8ef325b0fa9fea40ed18e40e96205a10851f6434;hpb=d8213149049056e0cabbcbe575a10dfb1a83583e;p=paraslash.git

diff --git a/stdin.c b/stdin.c
index 8ef325b0..4329e144 100644
--- a/stdin.c
+++ b/stdin.c
@@ -95,11 +95,11 @@ 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;
+	size_t sz;
 	char *buf = NULL;
 
 	t->error = 0;
@@ -110,20 +110,29 @@ static void stdin_post_select_btr(struct sched *s, struct task *t)
 		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);
+	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)
-		t->error = -ERRNO_TO_PARA_ERROR(errno);
+		ret = -ERRNO_TO_PARA_ERROR(errno);
 	if (ret == 0)
-		t->error = -E_STDIN_EOF;
-	if (t->error < 0)
+		ret = -E_STDIN_EOF;
+	if (ret < 0)
 		goto err;
-	btr_add_output(buf, ret, sit->btrn);
+	btr_add_output_pool(sit->btrp, ret, sit->btrn);
 	return;
 err:
-	free(buf);
 	btr_remove_node(sit->btrn);
+	//btr_pool_free(sit->btrp);
 	t->error = ret;
 }
 
@@ -134,7 +143,7 @@ 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 bufsize is initialized (but no buffer is allocated).
  */
 void stdin_set_defaults(struct stdin_task *sit)
 {
@@ -144,6 +153,7 @@ void stdin_set_defaults(struct stdin_task *sit)
 	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;