/*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
-/** \file audiod.c the paraslash's audio daemon */
+/** \file audiod.c The paraslash's audio daemon. */
#include <regex.h>
#include <sys/types.h>
#include <signal.h>
-#include <stdbool.h>
#include "para.h"
#include "error.h"
#include "signal.h"
#include "version.h"
+__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
/** define the array of error lists needed by para_audiod */
INIT_AUDIOD_ERRLISTS;
/** define the array containing all supported audio formats */
VSS_STATUS_FLAG_PLAYING = 2,
};
+struct sched sched = {.max_fileno = 0};
+
/**
* The task for obtaining para_server's status (para_client stat).
*
length / 60,
length % 60
);
- PARA_DEBUG_LOG("slot %d: %s\n", slot_num, msg);
+ //PARA_DEBUG_LOG("slot %d: %s\n", slot_num, msg);
return msg;
empty:
return para_strdup(NULL);
.handler = f->execute, .context = fn));
f->open(fn);
- register_task(&fn->task);
+ register_task(&sched, &fn->task);
parent = fn->btrn;
PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
audio_formats[s->format], i, nf, f->name, (int)(s - slot));
assert(s->wns == NULL);
s->wns = para_calloc(PARA_MAX(1U, a->num_writers)
* sizeof(struct writer_node));
- if (a->num_writers == 0)
- setup_writer_node(NULL, parent, s->wns);
- else {
- PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]);
- for (i = 0; i < a->num_writers; i++) {
- wn = s->wns + i;
- wn->conf = a->writer_conf[i];
- wn->writer_num = a->writer_nums[i];
- register_writer_node(wn, parent);
- }
+ PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]);
+ for (i = 0; i < a->num_writers; i++) {
+ wn = s->wns + i;
+ wn->conf = a->writer_conf[i];
+ wn->writer_num = a->writer_nums[i];
+ register_writer_node(wn, parent, &sched);
}
}
rn->task.pre_select = r->pre_select;
rn->task.post_select = r->post_select;
sprintf(rn->task.status, "%s receiver node", r->name);
- register_task(&rn->task);
+ register_task(&sched, &rn->task);
return slot_num;
}
ret = parse_stream_command(conf.writer_arg[i], &cmd);
if (ret < 0)
- goto out;
+ return ret;
af_mask = ret;
FOR_EACH_AUDIO_FORMAT(j) {
a = afi + j;
if ((af_mask & (1 << j)) == 0) /* no match */
continue;
- ret = -E_WRITE_COMMON_SYNTAX;
- wconf = check_writer_arg(cmd, &writer_num);
- if (!wconf)
- goto out;
+ wconf = check_writer_arg_or_die(cmd, &writer_num);
nw = a->num_writers;
a->writer_nums = para_realloc(a->writer_nums, (nw + 1) * sizeof(int));
a->writer_conf = para_realloc(a->writer_conf, (nw + 1) * sizeof(void *));
a->writer_nums[nw] = writer_num;
a->writer_conf[nw] = wconf;
- PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[writer_num],
+ PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[j],
nw, writer_names[writer_num]);
a->num_writers++;
}
}
- ret = 1;
-out:
- return ret;
+ /* Use default writer for audio formats which are not yet set up. */
+ FOR_EACH_AUDIO_FORMAT(i) {
+ struct writer *w = writers + DEFAULT_WRITER;
+ a = afi + i;
+ if (a->num_writers > 0)
+ continue; /* already set up */
+ PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
+ writer_names[DEFAULT_WRITER]);
+ a->writer_nums = para_malloc(sizeof(int));
+ a->writer_nums[0] = DEFAULT_WRITER;
+ a->writer_conf = para_malloc(sizeof(void *));
+ a->writer_conf[0] = w->parse_config_or_die("");
+ a->num_writers = 1;
+ }
+ return 1;
}
static int parse_receiver_args(void)
{
if (!stat_task->ct)
return;
- btr_free_node(stat_task->ct->btrn);
client_close(stat_task->ct);
stat_task->ct = NULL;
clear_and_dump_items();
if (a->num_filters)
open_filters(sl);
open_writers(sl);
- activate_grab_clients();
+ activate_grab_clients(&sched);
btr_log_tree(sl->receiver_node->btrn, LL_NOTICE);
}
if (must_start_decoder())
goto min_delay;
- ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
+ ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
if (ret > 0)
goto min_delay;
if (st->ct && audiod_status == AUDIOD_OFF)
}
/* restart the client task if necessary */
-static void status_post_select(__a_unused struct sched *s, struct task *t)
+static void status_post_select(struct sched *s, struct task *t)
{
struct status_task *st = container_of(t, struct status_task, task);
int argc = 5;
PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
st->clock_diff_count--;
- client_open(argc, argv, &st->ct, NULL, NULL, st->btrn);
+ client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s);
set_stat_task_restart_barrier(2);
} else {
char *argv[] = {"audiod", "--", "stat", "-p", NULL};
int argc = 4;
- client_open(argc, argv, &st->ct, NULL, NULL, st->btrn);
+ client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s);
set_stat_task_restart_barrier(5);
}
free(stat_item_values[SI_BASENAME]);
int main(int argc, char *argv[])
{
int ret, i;
- static struct sched s;
struct command_task command_task_struct, *cmd_task = &command_task_struct;
struct audiod_cmdline_parser_params params = {
.override = 0,
exit(EXIT_FAILURE);
}
log_welcome("para_audiod");
- server_uptime(UPTIME_SET);
+ set_server_start_time(NULL);
set_initial_status();
FOR_EACH_SLOT(i)
clear_slot(i);
init_command_task(cmd_task);
if (conf.daemon_given)
- daemonize();
-
- register_task(&sig_task->task);
- register_task(&cmd_task->task);
- register_task(&stat_task->task);
- s.default_timeout.tv_sec = 2;
- s.default_timeout.tv_usec = 999 * 1000;
- ret = schedule(&s);
+ daemonize(false /* parent exits immediately */);
+
+ register_task(&sched, &sig_task->task);
+ register_task(&sched, &cmd_task->task);
+ register_task(&sched, &stat_task->task);
+ sched.default_timeout.tv_sec = 2;
+ sched.default_timeout.tv_usec = 999 * 1000;
+ ret = schedule(&sched);
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
return EXIT_FAILURE;
projects / paraslash.git / blobdiff