X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=9fc20ed0253d91f9ecb3fe3591843feb48b82eb3;hp=4554145f3d24883e828c849e856e4eca2f428cc6;hb=ee7c57f8dc4edfdc91f2f8657b6429d90ab13e79;hpb=f76ab46a9216133332cb7e17d38d392caeca22cb

diff --git a/stdout.c b/stdout.c
index 4554145f..9fc20ed0 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file stdout.c Functions that deal with writing to stdout. */
 
-#include <assert.h>
-
 #include "para.h"
 #include "list.h"
 #include "sched.h"
@@ -16,18 +14,10 @@
 #include "stdout.h"
 #include "buffer_tree.h"
 
-/**
- * The pre_select function of the stdout task.
- *
- * \param s The scheduler this task was registered to.
- * \param t The task structure of the stdout task.
- *
- * This function is always successful. If there is input data available, it
- * adds \p STDOUT_FILENO to the write fd set of \a s.
- */
-static void stdout_pre_select(struct sched *s, struct task *t)
+/* Add STDOUT_FILENO to the write fd set if there is input data available. */
+static void stdout_pre_select(struct sched *s, void *context)
 {
-	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	struct stdout_task *sot = context;
 	int ret;
 
 	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
@@ -37,18 +27,13 @@ static void stdout_pre_select(struct sched *s, struct task *t)
 		sched_min_delay(s);
 }
 
-/**
- * The post select function of the stdout task.
- *
- * \param s The scheduler this task was registered to.
- * \param t The task structure of the stdout task.
- *
- * This function writes input data from the buffer tree to stdout if \p
+/*
+ * This function writes input data from the buffer tree to stdout if
  * STDOUT_FILENO is writable.
  */
-static int stdout_post_select(struct sched *s, struct task *t)
+static int stdout_post_select(struct sched *s, void *context)
 {
-	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	struct stdout_task *sot = context;
 	struct btr_node *btrn = sot->btrn;
 	int ret;
 	char *buf;
@@ -85,28 +70,33 @@ out:
 	}
 	return ret;
 }
+
 /**
- * Initialize a stdout task structure with default values.
+ * Register a stdout task structure.
  *
- * \param sot The stdout task structure.
+ * \param sot The stdout 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 sot.
+ * This sets up \a sot and registers a task with \a sot as context pointer.
  */
-void stdout_set_defaults(struct stdout_task *sot)
+void stdout_task_register(struct stdout_task *sot, struct sched *s)
 {
 	int ret;
+	struct task_info ti = {
+		.pre_select = stdout_pre_select,
+		.post_select = stdout_post_select,
+		.context = sot,
+		.name = "stdout",
+	};
 
-	sot->task.pre_select = stdout_pre_select;
-	sot->task.post_select = stdout_post_select;
-	sprintf(sot->task.status, "stdout");
-
-	/* See stdin.c for details. */
+	/* See \ref stdin.c for details. */
 	ret = fcntl(STDOUT_FILENO, F_GETFL);
 	if (ret < 0) {
 		PARA_EMERG_LOG("F_GETFL: %s\n", strerror(errno));
 		exit(EXIT_FAILURE);
 	}
 	sot->fd_flags = ret;
-	sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0;
+	sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0
+		&& !isatty(STDOUT_FILENO);
+	sot->task = task_register(&ti, s);
 }