X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=2ea8a5992034419cf0375bae43851172c136b765;hp=00c1dd849a94e22ae34337c21506d2f2b3238f42;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=70f527312e613fd89be88177dc2a44ad24b2d27c

diff --git a/recv_common.c b/recv_common.c
index 00c1dd84..2ea8a599 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -1,21 +1,21 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file recv_common.c common functions of para_recv and para_audiod */
 
-#include "para.h"
+#include <regex.h>
 
+#include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "recv.h"
 #include "string.h"
 
-DEFINE_RECEIVER_ARRAY;
-
 /**
  * Call the init function of each paraslash receiver.
  */
@@ -31,18 +31,13 @@ static void *parse_receiver_args(int receiver_num, char *options)
 {
 	struct receiver *r = &receivers[receiver_num];
 	char **argv;
-	int argc, i;
+	int argc;
 	void *conf;
 
-
-//	PARA_DEBUG_LOG("%s, options: %s\n", r->name,
-//		options? options : "(none)");
 	if (options) {
-		PARA_DEBUG_LOG("options: %s\n", options);
-		argc = split_args(options, &argv, " \t");
-		for (i = argc - 1; i >= 0; i--)
-			argv[i + 1] = argv[i];
-		argc += 1;
+		argc = create_shifted_argv(options, " \t", &argv);
+		if (argc < 0)
+			return NULL;
 	} else {
 		argc = 1;
 		argv = para_malloc(2 * sizeof(char*));
@@ -50,8 +45,7 @@ static void *parse_receiver_args(int receiver_num, char *options)
 	}
 	argv[0] = make_message("%s_recv", r->name);
 	conf = r->parse_config(argc, argv);
-	free(argv[0]);
-	free(argv);
+	free_argv(argv);
 	return conf;
 }
 
@@ -98,21 +92,46 @@ void *check_receiver_arg(char *ra, int *receiver_num)
 /**
  * Print out the help texts to all receivers.
  *
- * \param detailed Whether the detailed help should be printed.
+ * \param flags Passed to \ref ggo_print_help().
  */
-void print_receiver_helps(int detailed)
+void print_receiver_helps(unsigned flags)
 {
 	int i;
 
-	printf_or_die("\nAvailable receivers: \n\t");
+	printf_or_die("\nAvailable receivers: ");
 	FOR_EACH_RECEIVER(i)
 		printf_or_die("%s%s", i? " " : "", receivers[i].name);
-	printf_or_die("\n\n");
+	printf_or_die("\n");
 	FOR_EACH_RECEIVER(i) {
 		struct receiver *r = receivers + i;
 		if (!r->help.short_help)
 			continue;
-		printf_or_die("Options for %s:\n", r->name);
-		ggo_print_help(&r->help, detailed);
+		printf_or_die("\n%s: %s", r->name,
+			r->help.purpose);
+		ggo_print_help(&r->help, flags);
 	}
 }
+
+/**
+ * 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)
+		sched_min_delay(s);
+	return ret;
+}