X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=stdout.c;h=ba5f19670fce6c3c04d256a2056477064f5df7d3;hb=cdbc8067a2e27ee7f9e0d8ff11cf415603fc0558;hp=0ff24e92b1b7065b8c5a2267c70817487363d251;hpb=a96be5bc4fda8c0df5370d646defb5ff632ba391;p=paraslash.git

diff --git a/stdout.c b/stdout.c
index 0ff24e92..ba5f1967 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,13 +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 stdout.c Functions that deal with writing to stdout. */
 
-#include <assert.h>
-
 #include "para.h"
 #include "list.h"
 #include "sched.h"
@@ -16,39 +10,26 @@
 #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)
+/* Monitor STDOUT_FILENO if there is input data available. */
+static void stdout_pre_monitor(struct sched *s, void *context)
 {
-	struct stdout_task *sot = task_context(t);
+	struct stdout_task *sot = context;
 	int ret;
 
 	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
 	if (ret > 0)
-		para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+		sched_monitor_writefd(STDOUT_FILENO, s);
 	else if (ret < 0)
 		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
- * STDOUT_FILENO is writable.
+/*
+ * If input from the buffer tree is available and STDOUT_FILENO is ready, write
+ * as much as possible.
  */
-static int stdout_post_select(struct sched *s, struct task *t)
+static int stdout_post_monitor(struct sched *s, void *context)
 {
-	struct stdout_task *sot = task_context(t);
+	struct stdout_task *sot = context;
 	struct btr_node *btrn = sot->btrn;
 	int ret;
 	char *buf;
@@ -59,7 +40,7 @@ static int stdout_post_select(struct sched *s, struct task *t)
 		goto out;
 	if (ret == 0)
 		return 0;
-	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+	if (!sched_write_ok(STDOUT_FILENO, s))
 		return 0;
 
 	if (sot->must_set_nonblock_flag) {
@@ -98,19 +79,20 @@ 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,
+		.pre_monitor = stdout_pre_monitor,
+		.post_monitor = stdout_post_monitor,
 		.context = sot,
 		.name = "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);
 }