X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=07f779bd172ac5f83f78d53e133881b94cc54ef3;hp=466380fd773dfe71bcf52f6c884961cbc0239980;hb=32ffc06c0706f51c3f1dc436911836f1f9aa326e;hpb=9609fd30e0d3db45ede3ab5c6bc3a77c15b6aef8

diff --git a/grab_client.c b/grab_client.c
index 466380fd..07f779bd 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,8 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -62,9 +60,9 @@ struct grab_client {
 };
 
 /* Grab clients that are attached to a btr node. */
-INITIALIZED_LIST_HEAD(active_grab_client_list);
+static INITIALIZED_LIST_HEAD(active_grab_client_list);
 /* Grab clients that are not currently attached any btr node. */
-INITIALIZED_LIST_HEAD(inactive_grab_client_list);
+static INITIALIZED_LIST_HEAD(inactive_grab_client_list);
 
 static int gc_write(struct grab_client *gc, char *buf, size_t len)
 {
@@ -78,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, 0);
+	ret = xwrite(gc->fd, buf, len);
 	if (ret < 0)
 		goto err;
 	if (ret > 0)
@@ -101,11 +99,8 @@ static void gc_pre_select(struct sched *s, struct task *t)
 
 	if (ret == 0)
 		return;
-	if (ret < 0) {
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 0;
-		return;
-	}
+	if (ret < 0)
+		sched_min_delay(s);
 	para_fd_set(gc->fd, &s->wfds, &s->max_fileno);
 }
 
@@ -120,7 +115,7 @@ static void gc_post_select(struct sched *s, struct task *t);
  *
  * \param gc The grab client to activate.
  */
-static void gc_activate(struct grab_client *gc)
+static void gc_activate(struct grab_client *gc, struct sched *s)
 {
 	struct btr_node *root = audiod_get_btr_root(), *parent;
 	char *name = gc->name? gc->name : "grab";
@@ -134,18 +129,19 @@ static void gc_activate(struct grab_client *gc)
 	list_move(&gc->node, &active_grab_client_list);
 	gc->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = name, .parent = parent));
-	if (!gc->task.pre_select) {
-		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';
-		register_task(&gc->task);
-	}
+	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);
 }
 
 /**
  * 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
@@ -154,17 +150,17 @@ static void gc_activate(struct grab_client *gc)
  * This function also garbage collects all grab clients whose tasks have been
  * unscheduled.
  */
-void activate_grab_clients(void)
+void activate_grab_clients(struct sched *s)
 {
 	struct grab_client *gc, *tmp;
 
 	list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
-		if (gc->task.error == -E_TASK_UNREGISTERED) {
+		if (gc->fd < 0) {
 			list_del(&gc->node);
 			free(gc);
 			continue;
 		}
-		gc_activate(gc);
+		gc_activate(gc, s);
 	}
 }
 
@@ -182,11 +178,11 @@ static int gc_close(struct grab_client *gc, int err)
 		 * post_select().
 		 */
 		close(gc->fd);
+		gc->fd = -1;
 		free(gc->parent);
 		free(gc->name);
 		return 1;
 	}
-	gc_activate(gc);
 	return 0;
 }
 
@@ -213,7 +209,8 @@ static void gc_post_select(__a_unused struct sched *s, struct task *t)
 		btr_consume(btrn, ret);
 	return;
 err:
-	t->error = gc_close(gc, ret)? ret : 0;
+	gc_close(gc, ret);
+	t->error = ret;
 }
 
 static int gc_check_args(int argc, char **argv, struct grab_client *gc)
@@ -270,6 +267,7 @@ static int gc_check_args(int argc, char **argv, struct grab_client *gc)
  * \param fd The file descriptor of the client.
  * \param argc Argument count.
  * \param argv Argument vector.
+ * \param s The scheduler to register the grab client task to.
  *
  * If the command line options given by \a argc and \a argv are valid.
  * allocate a struct grab_client and initialize it with this valid
@@ -280,7 +278,7 @@ static int gc_check_args(int argc, char **argv, struct grab_client *gc)
  *
  * \return Standard.
  */
-int grab_client_new(int fd, int argc, char **argv)
+int grab_client_new(int fd, int argc, char **argv, struct sched *s)
 {
 	int ret;
 	struct grab_client *gc = para_calloc(sizeof(struct grab_client));
@@ -290,7 +288,7 @@ int grab_client_new(int fd, int argc, char **argv)
 		goto err_out;
 	gc->fd = fd;
 	para_list_add(&gc->node, &inactive_grab_client_list);
-	gc_activate(gc);
+	gc_activate(gc, s);
 	return 1;
 err_out:
 	free(gc);