X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=4554145f3d24883e828c849e856e4eca2f428cc6;hp=1c60669aa4579846d05958ea8f619ddf9d978c83;hb=bd10c0f46e0b7eadfb8c6d5cd45581cec253d775;hpb=b0cad48a864fe3f621138e717ff025060c396fad

diff --git a/stdout.c b/stdout.c
index 1c60669a..4554145f 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,58 +1,112 @@
+/*
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ *
+ * 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 "string.h"
 #include "list.h"
 #include "sched.h"
 #include "fd.h"
 #include "error.h"
 #include "stdout.h"
+#include "buffer_tree.h"
 
-void stdout_pre_select(struct sched *s, struct task *t)
+/**
+ * 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)
 {
-	struct stdout_task *sot = t->private_data;
-
-	t->ret = 1;
-	sot->check_fd = 0;
-	if (!*sot->loaded)
-		return;
-	sot->check_fd = 1;
-	para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
-}
+	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	int ret;
 
-void stdout_post_select(struct sched *s, struct task *t)
-{
-	struct stdout_task *sot = t->private_data;
-	ssize_t ret;
-
-	t->ret = 1;
-	if (!sot->check_fd) {
-		if (*sot->input_eof)
-			t->ret = -E_STDOUT_EOF;
-		return;
-	}
-	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
-		return;
-	t->ret = -E_STDOUT_WRITE;
-	ret = write(STDOUT_FILENO, sot->buf, *sot->loaded);
-	if (ret <= 0)
-		return;
-	*sot->loaded -= ret;
-	t->ret = 1;
+	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
+	if (ret > 0)
+		para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno);
+	else if (ret < 0)
+		sched_min_delay(s);
 }
 
-void stdout_default_event_handler(struct task *t)
+/**
+ * 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.
+ */
+static int stdout_post_select(struct sched *s, struct task *t)
 {
-	PARA_NOTICE_LOG("%p: %s\n", t, PARA_STRERROR(-t->ret));
-	unregister_task(t);
-}
+	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	struct btr_node *btrn = sot->btrn;
+	int ret;
+	char *buf;
+	size_t sz;
 
+	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+	if (ret < 0)
+		goto out;
+	if (ret == 0)
+		return 0;
+	if (!FD_ISSET(STDOUT_FILENO, &s->wfds))
+		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 = xwrite(STDOUT_FILENO, buf, sz);
+		if (ret <= 0)
+			break;
+		btr_consume(btrn, ret);
+	}
+out:
+	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.
+ *
+ * \param sot The stdout task structure.
+ *
+ * This fills in the pre/post select function pointers of the task structure
+ * given by \a sot.
+ */
 void stdout_set_defaults(struct stdout_task *sot)
 {
-	sot->task.private_data = sot;
+	int ret;
+
 	sot->task.pre_select = stdout_pre_select;
 	sot->task.post_select = stdout_post_select;
-	sot->task.event_handler = stdout_default_event_handler;
-	sot->task.flags = 0;
-	sot->eof = 0;
-	sprintf(sot->task.status, "stdout writer");
+	sprintf(sot->task.status, "stdout");
+
+	/* 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;
 }