X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=f4bcbb79d104a4752a8a5fa22df2c3a5cc6515fe;hp=672c96f1d6b42ac8fd75418486cdb02ce2d24395;hb=47a9983cc65ef57ad25c4ba3e16cabe48fd57b23;hpb=42ddd68159d7eff0f3e7c225665c97f9abd59425

diff --git a/grab_client.c b/grab_client.c
index 672c96f1..f4bcbb79 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -54,7 +54,7 @@ struct grab_client {
 	/** The point of the grab client's node in the buffer tree. */
 	struct btr_node *btrn;
 	/* The task of this grab client. */
-	struct task task;
+	struct task *task;
 	/** Belongs to either the active or the inactive list. */
 	struct list_head node;
 };
@@ -92,9 +92,9 @@ err:
 	return -E_GC_WRITE;
 }
 
-static void gc_pre_select(struct sched *s, struct task *t)
+static void gc_pre_select(struct sched *s, void *context)
 {
-	struct grab_client *gc = container_of(t, struct grab_client, task);
+	struct grab_client *gc = context;
 	int ret = btr_node_status(gc->btrn, 0, BTR_NT_LEAF);
 
 	if (ret == 0)
@@ -108,7 +108,7 @@ static void gc_pre_select(struct sched *s, struct task *t)
  * We need this forward declaration as post_select() needs
  * activate_grab_client and vice versa.
  */
-static int gc_post_select(struct sched *s, struct task *t);
+static int gc_post_select(struct sched *s, void *context);
 
 /**
  * Move a grab client to the active list and start it.
@@ -129,12 +129,13 @@ static void gc_activate(struct grab_client *gc, struct sched *s)
 	list_move(&gc->node, &active_grab_client_list);
 	gc->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = name, .parent = parent));
-	gc->task.pre_select = gc_pre_select;
-	gc->task.post_select = gc_post_select;
-	snprintf(gc->task.status, sizeof(gc->task.status) - 1, "%s", name);
-	gc->task.status[sizeof(gc->task.status) - 1] = '\0';
-	gc->task.error = 0;
-	register_task(s, &gc->task);
+
+	gc->task = task_register(&(struct task_info) {
+		.name = name,
+		.pre_select = gc_pre_select,
+		.post_select = gc_post_select,
+		.context = gc,
+	}, s);
 }
 
 /**
@@ -184,9 +185,9 @@ static int gc_close(struct grab_client *gc, int err)
 	return 0;
 }
 
-static int gc_post_select(__a_unused struct sched *s, struct task *t)
+static int gc_post_select(__a_unused struct sched *s, void *context)
 {
-	struct grab_client *gc = container_of(t, struct grab_client, task);
+	struct grab_client *gc = context;
 	struct btr_node *btrn = gc->btrn;
 	int ret;
 	size_t sz;