X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=9408235a045a6767e2acf443208d95196990d379;hp=d5425b28504493a65eda7381959cba8af31dbf5f;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=027f2c1237051d2d569d6be7f381c886f659bac3

diff --git a/stdin.c b/stdin.c
index d5425b28..9408235a 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,12 +1,7 @@
-/*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file stdin.c Functions that deal with reading from stdin. */
 
-#include <assert.h>
 #include <regex.h>
 
 #include "para.h"
@@ -18,19 +13,13 @@
 #include "buffer_tree.h"
 #include "string.h"
 
-/**
- * The pre_select function of the stdin task.
- *
- * \param s The scheduler this task was registered to.
- * \param t The task structure of the stdin task.
- *
- * This function is always successful. If there is space left in the
- * buffer of the stdin task, it adds \p STDIN_FILENO to the read fd set
- * of \a s.
+/*
+ * If there is space left in the buffer of the stdin task add STDIN_FILENO to
+ * the read fd set of s.
  */
-static void stdin_pre_select(struct sched *s, struct task *t)
+static void stdin_pre_select(struct sched *s, void *context)
 {
-	struct stdin_task *sit = container_of(t, struct stdin_task, task);
+	struct stdin_task *sit = context;
 	int ret;
 
 	ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT);
@@ -43,20 +32,14 @@ static void stdin_pre_select(struct sched *s, struct task *t)
 	sched_request_timeout_ms(100, s);
 }
 
-/**
- * The post select function of the stdin task.
- *
- * \param s The scheduler this task was registered to.
- * \param t The task structure of the stdin task.
- *
- * 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 and fed into the buffer
- * tree.
+/*
+ * This function checks if STDIN_FILENO was included by in the read fd set of s
+ * during the previous pre_select call. If so, and if STDIN_FILENO is readable,
+ * data is read from stdin and fed into the buffer tree.
  */
-static int stdin_post_select(struct sched *s, struct task *t)
+static int stdin_post_select(struct sched *s, void *context)
 {
-	struct stdin_task *sit = container_of(t, struct stdin_task, task);
+	struct stdin_task *sit = context;
 	ssize_t ret;
 	size_t sz, n;
 	char *buf = NULL;
@@ -95,21 +78,25 @@ err:
 }
 
 /**
- * Initialize a stdin task structure with default values.
+ * Register a stdin task structure.
  *
- * \param sit The stdin task structure.
+ * \param sit The stdin task structure to register.
+ * \param s The task will be added to this scheduler's task list.
  *
- * This fills in the pre/post select function pointers of the task structure
- * given by \a sit and creates a buffer tree for I/O.
+ * This allocates a buffer tree pool for I/O, sets up \a sit and registers a
+ * task with \a sit as context pointer.
  */
-void stdin_set_defaults(struct stdin_task *sit)
+void stdin_task_register(struct stdin_task *sit, struct sched *s)
 {
 	int ret;
+	struct task_info ti = {
+		.name = "stdin",
+		.pre_select = stdin_pre_select,
+		.post_select = stdin_post_select,
+		.context = sit,
+	};
 
-	sit->task.pre_select = stdin_pre_select;
-	sit->task.post_select = stdin_post_select;
 	sit->btrp = btr_pool_new("stdin", 128 * 1024);
-	sprintf(sit->task.status, "stdin reader");
 	/*
 	 * Both STDIN_FILENO and STDOUT_FILENO may refer to the same open file
 	 * description (the terminal), and thus share the same file status
@@ -123,5 +110,7 @@ void stdin_set_defaults(struct stdin_task *sit)
 		exit(EXIT_FAILURE);
 	}
 	sit->fd_flags = ret;
-	sit->must_set_nonblock_flag = (sit->fd_flags & O_NONBLOCK) == 0;
+	sit->must_set_nonblock_flag = (sit->fd_flags & O_NONBLOCK) == 0
+		&& !isatty(STDIN_FILENO);
+	sit->task = task_register(&ti, s);
 }