X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=5604fced075f5c2b24b8df622c6e0ad5c3a320dc;hp=83703055c83c54edc9a7e17b050f3ca2d076c61e;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=39ef1da5509461b18beb5b8f16ff6118c20c0ac6;ds=sidebyside

diff --git a/stdout.c b/stdout.c
index 83703055..5604fced 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,40 +1,103 @@
+/*
+ * Copyright (C) 2006-2011 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 <dirent.h> /* readdir() */
+#include <assert.h>
+#include <stdbool.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;
+	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	int ret;
 
-	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);
+	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);
+	else if (ret < 0)
+		sched_min_delay(s);
 }
 
-void stdout_post_select(struct sched *s, 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 void stdout_post_select(struct sched *s, struct task *t)
 {
-	struct stdout_task *sot = t->private_data;
-	ssize_t ret;
+	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	struct btr_node *btrn = sot->btrn;
+	int ret;
+	char *buf;
+	size_t sz;
 
-	t->ret = 1;
-	if (!sot->check_fd) {
-		if (*sot->eof)
-			t->ret = -E_STDOUT_EOF;
+	t->error = 0;
+	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
+	if (ret < 0)
+		goto out;
+	if (ret == 0)
 		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)
+
+	for (;;) {
+		sz = btr_next_buffer(btrn, &buf);
+		if (sz == 0)
+			break;
+		ret = write_nonblock(STDOUT_FILENO, buf, sz);
+		if (ret <= 0)
+			break;
+		btr_consume(btrn, ret);
+	}
+out:
+	if (ret < 0)
+		btr_remove_node(btrn);
+	t->error = 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 and sets the stdout file descriptor to nonblocking mode.
+ */
+void stdout_set_defaults(struct stdout_task *sot)
+{
+	int ret;
+
+	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;
-	*sot->loaded -= ret;
-	t->ret = 1;
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+	exit(EXIT_FAILURE);
 }