Merge branch 't/buffer_tree_improvements'

[paraslash.git] / recv_common.c

diff --git a/recv_common.c b/recv_common.c
index 2840df00b4317d143bcadec5637e0ca4d1200ef7..2ea8a5992034419cf0375bae43851172c136b765 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -1,47 +1,51 @@
 /*
- * 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.
+ */
+void recv_init(void)
+{
+       int i;
+
+       FOR_EACH_RECEIVER(i)
+               receivers[i].init(&receivers[i]);
+}
+
 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];
-               argv[0] = para_strdup(r->name);
-               argc += 1;
-               PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
+               argc = create_shifted_argv(options, " \t", &argv);
+               if (argc < 0)
+                       return NULL;
        } 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);
-       free(argv[0]);
-       free(argv);
+       free_argv(argv);
        return conf;
 }
 
@@ -88,22 +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;
+}