* of \a s.
*/
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)
- return;
- sit->check_fd = 1;
- 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;
*
* 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;
-
- 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);
- if (ret < 0)
- t->error = ERRNO_TO_PARA_ERROR(errno);
- else if (ret > 0)
- sit->loaded += ret;
- else
- 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;
*
* 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 (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;
- sit->btrp = btr_pool_new("stdin", 64 * 1024);
- } 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);
}