X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=cf33bf6d0b67cf49625d27b4d602dec35922d32d;hp=0f0c0e539a06f584f4a26ed88c4beb8d1d7551ba;hb=820ae21f7a453408dca3faa9ff1d28ca94d60009;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/stdout.c b/stdout.c
index 0f0c0e53..cf33bf6d 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -30,7 +30,6 @@ static void stdout_pre_select(struct sched *s, struct task *t)
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
 	int ret;
 
-	t->error = 0;
 	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
 	if (ret > 0)
 		para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
@@ -47,7 +46,7 @@ static void stdout_pre_select(struct sched *s, struct task *t)
  * This function writes input data from the buffer tree to stdout if \p
  * STDOUT_FILENO is writable.
  */
-static void stdout_post_select(struct sched *s, struct task *t)
+static int stdout_post_select(struct sched *s, struct task *t)
 {
 	struct stdout_task *sot = container_of(t, struct stdout_task, task);
 	struct btr_node *btrn = sot->btrn;
@@ -55,28 +54,36 @@ static void stdout_post_select(struct sched *s, struct task *t)
 	char *buf;
 	size_t sz;
 
-	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
 	if (ret < 0)
 		goto out;
 	if (ret == 0)
-		return;
+		return 0;
 	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
-		return;
+		return 0;
 
+	if (sot->must_set_nonblock_flag) {
+		ret = mark_fd_nonblocking(STDOUT_FILENO);
+		if (ret < 0)
+			goto out;
+		sot->must_set_nonblock_flag = false;
+	}
 	for (;;) {
 		sz = btr_next_buffer(btrn, &buf);
 		if (sz == 0)
 			break;
-		ret = write_nonblock(STDOUT_FILENO, buf, sz);
+		ret = xwrite(STDOUT_FILENO, buf, sz);
 		if (ret <= 0)
 			break;
 		btr_consume(btrn, ret);
 	}
 out:
-	if (ret < 0)
-		btr_remove_node(btrn);
-	t->error = ret;
+	if (ret < 0) {
+		btr_remove_node(&sot->btrn);
+		/* Revert to blocking mode if necessary. */
+		fcntl(STDOUT_FILENO, F_SETFL, sot->fd_flags);
+	}
+	return ret;
 }
 /**
  * Initialize a stdout task structure with default values.
@@ -84,7 +91,7 @@ out:
  * \param sot The stdout task structure.
  *
  * This fills in the pre/post select function pointers of the task structure
- * given by \a sot and sets the stdout file descriptor to nonblocking mode.
+ * given by \a sot.
  */
 void stdout_set_defaults(struct stdout_task *sot)
 {
@@ -93,9 +100,13 @@ void stdout_set_defaults(struct stdout_task *sot)
 	sot->task.pre_select = stdout_pre_select;
 	sot->task.post_select = stdout_post_select;
 	sprintf(sot->task.status, "stdout");
-	ret = mark_fd_nonblocking(STDOUT_FILENO);
-	if (ret >= 0)
-		return;
-	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-	exit(EXIT_FAILURE);
+
+	/* See 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;
 }