From aa05cb41dd2f031935507e89b56b1e6096b846db Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 29 Dec 2009 01:26:24 +0100 Subject: [PATCH] stdin.c: btr preparations. --- buffer_tree.c | 2 +- buffer_tree.h | 2 +- error.h | 2 ++ http_recv.c | 4 +++ stdin.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++--- stdin.h | 2 ++ 6 files changed, 76 insertions(+), 5 deletions(-) diff --git a/buffer_tree.c b/buffer_tree.c index 1046460d..1ca4a153 100644 --- a/buffer_tree.c +++ b/buffer_tree.c @@ -124,7 +124,7 @@ void btr_pushdown(struct btr_node *btrn) } /* Return true if this node has no children. */ -bool btr_is_leaf_node(struct btr_node *btrn) +bool btr_no_children(struct btr_node *btrn) { return list_empty(&btrn->children); } diff --git a/buffer_tree.h b/buffer_tree.h index d3409736..04217801 100644 --- a/buffer_tree.h +++ b/buffer_tree.h @@ -4,7 +4,7 @@ struct btr_node; struct btr_node *btr_new_node(char *name, struct btr_node *parent); void btr_del_node(struct btr_node *btrn); void btr_add_output(char *buf, size_t size, struct btr_node *btrn); -bool btr_is_leaf_node(struct btr_node *btrn); +bool btr_no_children(struct btr_node *btrn); size_t btr_bytes_pending(struct btr_node *btrn); size_t btr_get_input_queue_size(struct btr_node *btrn); bool btr_no_parent(struct btr_node *btrn); diff --git a/error.h b/error.h index 4aec60d8..9ef417ff 100644 --- a/error.h +++ b/error.h @@ -216,6 +216,7 @@ extern const char **para_errlist[]; #define STDIN_ERRORS \ PARA_ERROR(STDIN_EOF, "end of file"), \ + PARA_ERROR(STDIN_NO_CHILD, "stdin btr node has no children"), \ @@ -238,6 +239,7 @@ extern const char **para_errlist[]; #define HTTP_RECV_ERRORS \ PARA_ERROR(HTTP_RECV_OVERRUN, "http_recv: output buffer overrun"), \ + PARA_ERROR(HTTP_RECV_NO_CHILD, "http_recv btr node has no children"), \ #define RECV_COMMON_ERRORS \ diff --git a/http_recv.c b/http_recv.c index abb8c1e8..a6d792b7 100644 --- a/http_recv.c +++ b/http_recv.c @@ -136,6 +136,10 @@ static void http_recv_post_select(struct sched *s, struct task *t) if (conf->buffer_tree_given) { char *buf; + if (btr_no_children(rn->btrn)) { + t->error = -E_HTTP_RECV_NO_CHILD; + goto err; + } if (btr_bytes_pending(rn->btrn) > HTTP_RECV_MAX_PENDING) { t->error = -E_HTTP_RECV_OVERRUN; goto err; diff --git a/stdin.c b/stdin.c index f66d1bba..d080e216 100644 --- a/stdin.c +++ b/stdin.c @@ -8,6 +8,8 @@ #include /* readdir() */ #include +#include +#include #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,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 (1024 * 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)) { + 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. * @@ -76,6 +101,39 @@ static void stdin_post_select(struct sched *s, struct task *t) t->error = -E_STDIN_EOF; } +#define STDIN_INPUT_BUFFER_SIZE 4000 +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); + 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. * @@ -89,9 +147,14 @@ void stdin_set_defaults(struct stdin_task *sit) { int ret; - sit->bufsize = 32 * 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; + } 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) diff --git a/stdin.h b/stdin.h index edb72cf8..8e5b3ce5 100644 --- a/stdin.h +++ b/stdin.h @@ -20,6 +20,8 @@ struct stdin_task { int check_fd; /** The task structure. */ struct task task; + /** Non-null if buffer tree API should be used. */ + struct btr_node *btrn; }; void stdin_set_defaults(struct stdin_task *sit); -- 2.39.2