X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdout.c;h=0ff24e92b1b7065b8c5a2267c70817487363d251;hp=cf33bf6d0b67cf49625d27b4d602dec35922d32d;hb=69a294cd641c623db61f46ee86901845789a1c7b;hpb=3b7cc768deb62e635bd06541418d22b59d35883c

diff --git a/stdout.c b/stdout.c
index cf33bf6d..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,7 +27,7 @@
  */
 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;
 
 	ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF);
@@ -48,7 +48,7 @@ static void stdout_pre_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;
@@ -85,21 +85,24 @@ out:
 	}
 	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);
@@ -109,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);
 }