X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=4f157ab5e6ba6f8fa8623b98e072d17c20395b9a;hp=535d8c16075dc931d4ec935630e1de92362e3af5;hb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0;hpb=f42b5eccb6ec3364dc0500ffeffbe9d9ecab07bd

diff --git a/recv_common.c b/recv_common.c
index 535d8c16..4f157ab5 100644
--- a/recv_common.c
+++ b/recv_common.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.
  */
@@ -7,7 +7,6 @@
 /** \file recv_common.c common functions of para_recv and para_audiod */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -47,16 +46,15 @@ static void *parse_receiver_args(int receiver_num, char *options)
 			return NULL;
 		for (i = argc - 1; i >= 0; i--)
 			argv[i + 1] = argv[i];
-		argv[0] = NULL;
 		argc++;
 	} else {
 		argc = 1;
 		argv = para_malloc(2 * sizeof(char*));
-		argv[0] = NULL;
 		argv[1] = NULL;
 	}
+	argv[0] = make_message("%s_recv", r->name);
 	conf = r->parse_config(argc, argv);
-	for (i = 1; i < argc; i++)
+	for (i = 0; i < argc; i++)
 		free(argv[i]);
 	free(argv);
 	return conf;
@@ -124,15 +122,26 @@ void print_receiver_helps(int detailed)
 	}
 }
 
+/**
+ * Simple pre-select hook, used by all receivers.
+ *
+ * \param s Scheduler info.
+ * \param t Determines the receiver node.
+ *
+ * This requests a minimal delay from the scheduler if the status of the buffer
+ * tree node indicates an error/eof condition. No file descriptors are added to
+ * the fd sets of \a s.
+ *
+ * \return The status of the btr node of the receiver node, i.e. the return
+ * value of the underlying call to \ref btr_node_status().
+ */
 int generic_recv_pre_select(struct sched *s, struct task *t)
 {
 	struct receiver_node *rn = container_of(t, struct receiver_node, task);
 	int ret = btr_node_status(rn->btrn, 0, BTR_NT_ROOT);
 
 	t->error = 0;
-	if (ret < 0) {
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1;
-	}
+	if (ret < 0)
+		sched_min_delay(s);
 	return ret;
 }