/*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "list.h"
#include "sched.h"
#include "ggo.h"
-#include "recv.h"
#include "buffer_tree.h"
+#include "recv.h"
#include "filter.h"
#include "grab_client.h"
#include "client.cmdline.h"
/** define the array containing all supported audio formats */
const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
+DEFINE_RECEIVER_ARRAY;
+
/** Defines how audiod handles one supported audio format. */
struct audio_format_info {
/** pointer to the receiver for this audio format */
PARA_NOTICE_LOG("closing %s receiver in slot %d\n",
audio_formats[s->format], slot_num);
a->receiver->close(s->receiver_node);
- btr_free_node(s->receiver_node->btrn);
+ btr_remove_node(&s->receiver_node->btrn);
free(s->receiver_node);
s->receiver_node = NULL;
tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
w = writers + wn->writer_num;
PARA_INFO_LOG("closing %s\n", writer_names[wn->writer_num]);
w->close(wn);
- btr_free_node(wn->btrn);
+ btr_remove_node(&wn->btrn);
}
static void close_writers(struct slot_info *s)
f = filters + fn->filter_num;
if (f->close)
f->close(fn);
- btr_free_node(fn->btrn);
+ btr_remove_node(&fn->btrn);
}
free(s->fns);
s->fns = NULL;
}
-/*
- * Whenever a task commits suicide by returning from post_select with t->error
- * < 0, it also removes its btr node. We do exactly that to kill a running
- * task. Note that the scheduler checks t->error also _before_ each pre/post
- * select call, so the victim will never be scheduled again.
- */
-static void kill_btrn(struct btr_node *btrn, struct task *t, int error)
-{
- if (t->error < 0)
- return;
- t->error = error;
- btr_remove_node(btrn);
-}
-
-static void kill_all_decoders(int error)
+static void notify_receivers(int error)
{
int i;
continue;
if (!s->receiver_node)
continue;
- kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
- error);
+ task_notify(&s->receiver_node->task, error);
}
}
fn->filter_num = a->filter_nums[i];
fn->conf = a->filter_conf[i];
fn->task.pre_select = f->pre_select;
- fn->task.post_select = f->post_select;
-
+ fn->task.new_post_select = f->new_post_select;
fn->btrn = btr_new_node(&(struct btr_node_description)
EMBRACE(.name = f->name, .parent = parent,
.handler = f->execute, .context = fn));
EMBRACE(.name = r->name, .context = rn));
ret = r->open(rn);
if (ret < 0) {
- btr_free_node(rn->btrn);
+ btr_remove_node(&rn->btrn);
free(rn);
return ret;
}
PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
audio_formats[format], r->name, slot_num);
rn->task.pre_select = r->pre_select;
- rn->task.post_select = r->post_select;
+ rn->task.new_post_select = r->new_post_select;
sprintf(rn->task.status, "%s receiver node", r->name);
register_task(&sched, &rn->task);
return slot_num;
}
/* Use default writer for audio formats which are not yet set up. */
FOR_EACH_AUDIO_FORMAT(i) {
- struct writer *w = writers + DEFAULT_WRITER;
+ void *writer_conf;
+ int writer_num;
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]);
+ writer_conf = check_writer_arg_or_die(NULL, &writer_num);
a->writer_nums = para_malloc(sizeof(int));
- a->writer_nums[0] = DEFAULT_WRITER;
+ a->writer_nums[0] = writer_num;
a->writer_conf = para_malloc(sizeof(void *));
- a->writer_conf[0] = w->parse_config_or_die("");
+ a->writer_conf[0] = writer_conf;
a->num_writers = 1;
+ PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
+ writer_names[writer_num]);
}
return 1;
}
para_fd_set(st->fd, &s->rfds, &s->max_fileno);
}
-static void signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
{
int signum;
PARA_EMERG_LOG("terminating on signal %d\n", signum);
clean_exit(EXIT_FAILURE, "caught deadly signal");
}
+ return 0;
}
static void signal_setup_default(struct signal_task *st)
{
st->task.pre_select = signal_pre_select;
- st->task.post_select = signal_post_select;
+ st->task.new_post_select = signal_post_select;
sprintf(st->task.status, "signal task");
}
para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
}
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
{
int ret;
struct command_task *ct = container_of(t, struct command_task, task);
if (ret < 0)
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
audiod_status_dump();
+ return 0;
}
static void init_command_task(struct command_task *ct)
{
ct->task.pre_select = command_pre_select;
- ct->task.post_select = command_post_select;
+ ct->task.new_post_select = command_post_select;
ct->task.error = 0;
ct->fd = audiod_get_socket(); /* doesn't return on errors */
sprintf(ct->task.status, "command task");
tv_add(now, &delay, &stat_task->restart_barrier);
}
-static void try_to_close_slot(int slot_num)
+static bool must_close_slot(int slot_num)
{
struct slot_info *s = &slot[slot_num];
struct audio_format_info *a = afi + s->format;
int i;
if (s->format < 0)
- return;
+ return false;
if (s->receiver_node && s->receiver_node->task.error >= 0)
- return;
+ return false;
for (i = 0; i < a->num_filters; i++)
if (s->fns && s->fns[i].task.error >= 0)
- return;
+ return false;
if (a->num_writers > 0) {
for (i = 0; i < a->num_writers; i++)
if (s->wns && s->wns[i].task.error >= 0)
- return;
+ return false;
} else {
if (s->wns && s->wns[0].task.error >= 0)
- return;
+ return false;
+ }
+ return true;
+}
+
+static void close_unused_slots(void)
+{
+ int i;
+
+ FOR_EACH_SLOT(i) {
+ struct slot_info *s = slot + i;
+ if (!must_close_slot(i))
+ continue;
+ PARA_INFO_LOG("closing slot %d\n", i);
+ close_writers(s);
+ close_filters(s);
+ close_receiver(i);
+ clear_slot(i);
}
- PARA_INFO_LOG("closing slot %d\n", slot_num);
- close_writers(s);
- close_filters(s);
- close_receiver(slot_num);
- clear_slot(slot_num);
}
/*
*/
static void start_stop_decoders(void)
{
- int i, ret;
+ int ret;
struct slot_info *sl;
struct audio_format_info *a;
- FOR_EACH_SLOT(i)
- try_to_close_slot(i);
+ close_unused_slots();
if (audiod_status != AUDIOD_ON ||
!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
- return kill_all_decoders(-E_NOT_PLAYING);
+ return notify_receivers(E_NOT_PLAYING);
if (!must_start_decoder())
return;
ret = open_receiver(stat_task->current_audio_format_num);
static void status_pre_select(struct sched *s, struct task *t)
{
struct status_task *st = container_of(t, struct status_task, task);
- int ret, cafn = stat_task->current_audio_format_num;
+ int i, ret, cafn = stat_task->current_audio_format_num;
if (must_start_decoder())
goto min_delay;
+ FOR_EACH_SLOT(i)
+ if (must_close_slot(i))
+ goto min_delay;
ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
if (ret > 0)
goto min_delay;
}
/* restart the client task if necessary */
-static void status_post_select(struct sched *s, struct task *t)
+static int status_post_select(struct sched *s, struct task *t)
{
struct status_task *st = container_of(t, struct status_task, task);
if (!st->ct)
goto out;
if (st->ct->task.error >= 0) {
- kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
+ task_notify(&st->ct->task, E_AUDIOD_OFF);
goto out;
}
- if (st->ct->task.error >= 0)
- goto out;
close_stat_pipe();
st->clock_diff_count = conf.clock_diff_count_arg;
goto out;
size_t sz;
int ret;
if (st->ct->task.error < 0) {
- if (st->ct->task.error >= 0)
- goto out;
close_stat_pipe();
goto out;
}
struct timeval diff;
tv_diff(now, &st->last_status_read, &diff);
if (diff.tv_sec > 61)
- kill_btrn(st->ct->btrn, &st->ct->task,
- -E_STATUS_TIMEOUT);
+ task_notify(&st->ct->task, E_AUDIOD_OFF);
goto out;
}
btr_merge(st->btrn, st->min_iqs);
sz = btr_next_buffer(st->btrn, &buf);
ret = for_each_stat_item(buf, sz, update_item);
if (ret < 0) {
- kill_btrn(st->ct->btrn, &st->ct->task, ret);
+ task_notify(&st->ct->task, E_AUDIOD_OFF);
goto out;
}
if (sz != ret) {
st->last_status_read = *now;
out:
start_stop_decoders();
+ return 0;
}
static void init_status_task(struct status_task *st)
{
memset(st, 0, sizeof(struct status_task));
st->task.pre_select = status_pre_select;
- st->task.post_select = status_post_select;
+ st->task.new_post_select = status_post_select;
st->sa_time_diff_sign = 1;
st->clock_diff_count = conf.clock_diff_count_arg;
st->current_audio_format_num = -1;
projects / paraslash.git / blobdiff