X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=0ef1c15f33593b9067e385a5c1aab65dcf66f0cd;hp=ef3f34a76216e3b677e82e435ef5d5f947667891;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/grab_client.c b/grab_client.c
index ef3f34a7..0ef1c15f 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 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;
 };
@@ -76,7 +76,7 @@ static int gc_write(struct grab_client *gc, char *buf, size_t len)
 		if (gc->mode == GM_SLOPPY)
 			return len;
 	}
-	ret = write_nonblock(gc->fd, buf, len);
+	ret = xwrite(gc->fd, buf, len);
 	if (ret < 0)
 		goto err;
 	if (ret > 0)
@@ -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 void 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,17 +129,20 @@ 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);
 }
 
 /**
  * Activate inactive grab clients if possible.
  *
+ * \param s Needed to schedule the grab client task.
+ *
  * This is called from audiod.c when the current audio file changes. It loops
  * over all inactive grab clients and checks each grab client's configuration
  * to determine if the client in question wishes to grab the new stream.  If
@@ -164,9 +167,7 @@ void activate_grab_clients(struct sched *s)
 
 static int gc_close(struct grab_client *gc, int err)
 {
-	btr_remove_node(gc->btrn);
-	btr_free_node(gc->btrn);
-	gc->btrn = NULL;
+	btr_remove_node(&gc->btrn);
 	PARA_INFO_LOG("closing gc: %s\n", para_strerror(-err));
 	list_move(&gc->node, &inactive_grab_client_list);
 	if (err == -E_GC_WRITE || (gc->flags & GF_ONE_SHOT)) {
@@ -184,18 +185,17 @@ static int gc_close(struct grab_client *gc, int err)
 	return 0;
 }
 
-static void 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;
 	char *buf;
 
-	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_LEAF);
 	if (ret == 0)
-		return;
+		return 0;
 	if (ret < 0)
 		goto err;
 	sz = btr_next_buffer(btrn, &buf);
@@ -205,10 +205,10 @@ static void gc_post_select(__a_unused struct sched *s, struct task *t)
 		goto err;
 	if (ret > 0)
 		btr_consume(btrn, ret);
-	return;
+	return 0;
 err:
 	gc_close(gc, ret);
-	t->error = ret;
+	return ret;
 }
 
 static int gc_check_args(int argc, char **argv, struct grab_client *gc)
@@ -284,7 +284,12 @@ int grab_client_new(int fd, int argc, char **argv, struct sched *s)
 	ret = gc_check_args(argc, argv, gc);
 	if (ret < 0)
 		goto err_out;
-	gc->fd = fd;
+	ret = dup(fd);
+	if (ret < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		goto err_out;
+	}
+	gc->fd = ret;
 	para_list_add(&gc->node, &inactive_grab_client_list);
 	gc_activate(gc, s);
 	return 1;