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

diff --git a/stdout.c b/stdout.c
index 0cf4876d..0ff24e92 100644
--- a/stdout.c
+++ b/stdout.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -27,10 +27,9 @@
  */
 static void stdout_pre_select(struct sched *s, struct task *t)
 {
-	struct stdout_task *sot = container_of(t, struct stdout_task, task);
+	struct stdout_task *sot = task_context(t);
 	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,22 +46,21 @@ 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 stdout_task *sot = task_context(t);
 	struct btr_node *btrn = sot->btrn;
 	int ret;
 	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);
@@ -85,23 +83,26 @@ out:
 		/* Revert to blocking mode if necessary. */
 		fcntl(STDOUT_FILENO, F_SETFL, sot->fd_flags);
 	}
-	t->error = ret;
+	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;
-
-	sot->task.pre_select = stdout_pre_select;
-	sot->task.post_select = stdout_post_select;
-	sprintf(sot->task.status, "stdout");
+	struct task_info ti = {
+		.pre_select = stdout_pre_select,
+		.post_select = stdout_post_select,
+		.context = sot,
+		.name = "stdout",
+	};
 
 	/* See stdin.c for details. */
 	ret = fcntl(STDOUT_FILENO, F_GETFL);
@@ -111,4 +112,5 @@ void stdout_set_defaults(struct stdout_task *sot)
 	}
 	sot->fd_flags = ret;
 	sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0;
+	sot->task = task_register(&ti, s);
 }