*socket_name, *hostname;
static char *stat_item_values[NUM_STAT_ITEMS];
static FILE *logfile;
-static const struct timeval restart_delay = {0, 300 * 1000};
+static const struct timeval restart_delay = {0, 200 * 1000};
static struct audio_format_info afi[NUM_AUDIO_FORMATS];
static struct timeval *now;
unsigned loaded;
/** the associated task structure */
struct task task;
+ /** do not restart client command until this time */
+ struct timeval restart_barrier;
};
static struct status_task status_task_struct, *stat_task = &status_task_struct;
static int com_grab(int, char *);
static int com_cycle(int, int, char **);
static int com_help(int, int, char **);
+static int com_kill(int, int, char **);
static int com_off(int, int, char **);
static int com_on(int, int, char **);
static int com_sb(int, int, char **);
static int com_stat(int, int, char **);
+static int com_tasks(int, int, char **);
static int com_term(int, int, char **);
static struct audiod_command cmds[] = {
{
"\n"
" -- Beatles: Help\n"
+},
+{
+.name = "kill",
+.handler = com_kill,
+.description = "kill an active audiod task",
+.synopsis = "kill task_id [task_id ...]",
+.help =
+
+"call sched_unregister() and the event_handler of the given task(s)\n"
+
},
{
.name = "off",
"Dump given status items (all if none given) to stdout.\n"
+},
+{
+.name = "tasks",
+.handler = com_tasks,
+.description = "list current tasks",
+.synopsis = "tasks",
+.help =
+
+"print the list of task ids together with the status of each task\n"
+
},
{
.name = "term",
para_install_sighandler(SIGTERM);
para_install_sighandler(SIGCHLD);
para_install_sighandler(SIGHUP);
- signal(SIGPIPE, SIG_IGN);
+ para_install_sighandler(SIGPIPE);
+// signal(SIGPIPE, SIG_IGN);
}
static void audiod_status_dump(void)
a = &afi[s->format];
PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n",
audio_formats[s->format] , slot_num, s->receiver_node->eof);
- if (!s->receiver_node->eof)
- unregister_task(&s->receiver_node->task);
+// if (!s->receiver_node->eof)
+// unregister_task(&s->receiver_node->task);
a->receiver->close(s->receiver_node);
free(s->receiver_node);
s->receiver_node = NULL;
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
- if (s->receiver_node)
+ if (s->wng && !s->wng->eof) {
+ PARA_INFO_LOG("unregistering writer node group in slot %d\n",
+ i);
+ wng_unregister(s->wng);
+ s->wng->eof = 1;
+ }
+ if (s->fc && !s->fc->eof) {
+ PARA_INFO_LOG("unregistering filter chain in slot %d\n", i);
+ unregister_task(&s->fc->task);
+ s->fc->eof = 1;
+ }
+ if (s->receiver_node && !s->receiver_node->eof) {
+ PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i);
+ unregister_task(&s->receiver_node->task);
s->receiver_node->eof = 1;
+ }
}
}
close(stat_task->fd);
del_close_on_fork_list(stat_task->fd);
stat_task->fd = -1;
- kill_all_decoders();
+// kill_all_decoders();
for (i = 0; i < NUM_STAT_ITEMS; i++) {
free(stat_item_values[i]);
stat_item_values[i] = NULL;
static void filter_event_handler(struct task *t)
{
PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+ struct filter_chain *fc = t->private_data;
+ fc->eof = 1;
unregister_task(t);
}
s->fc->inbuf = s->receiver_node->buf;
s->fc->in_loaded = &s->receiver_node->loaded;
s->fc->input_eof = &s->receiver_node->eof;
-
s->fc->task.pre_select = filter_pre_select;
s->fc->task.event_handler = filter_event_handler;
s->fc->task.private_data = s->fc;
- s->fc->task.flags = 0;
s->fc->eof = 0;
+
+ s->receiver_node->output_eof = &s->fc->eof;
sprintf(s->fc->task.status, "filter chain");
for (i = 0; i < nf; i++) {
struct filter_node *fn = para_calloc(sizeof(struct filter_node));
static void wng_event_handler(struct task *t)
{
+ struct writer_node_group *wng = t->private_data;
+
PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
- unregister_task(t);
+ wng->eof = 1;
+ wng_unregister(wng);
}
static void open_writers(int slot_num)
s->wng->buf = s->fc->outbuf;
s->wng->loaded = s->fc->out_loaded;
s->wng->input_eof = &s->fc->eof;
+ s->wng->channels = &s->fc->channels;
+ s->wng->samplerate = &s->fc->samplerate;
s->fc->output_eof = &s->wng->eof;
+ PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
} else {
s->wng->buf = s->receiver_node->buf;
s->wng->loaded = &s->receiver_node->loaded;
for (i = 0; i < a->num_writers; i++) {
s->wng->writer_nodes[i].conf = a->writer_conf[i];
s->wng->writer_nodes[i].writer = a->writers[i];
- sprintf(s->wng->writer_nodes[i].task.status, "writer_node");
}
ret = wng_open(s->wng);
+ if (ret < 0) {
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ return;
+ }
s->wstime = *now;
current_decoder = slot_num;
activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
static void rn_event_handler(struct task *t)
{
-// struct receiver_node *rn = t->private_data;
+ struct receiver_node *rn = t->private_data;
+
PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
unregister_task(t);
+ rn->eof = 1;
}
static void open_receiver(int format)
rn->task.pre_select = a->receiver->pre_select;
rn->task.post_select = a->receiver->post_select;
rn->task.event_handler = rn_event_handler;
- rn->task.flags = 0;
- sprintf(rn->task.status, "receiver node");
+ sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
register_task(&rn->task);
}
-static int is_frozen(int format)
-{
- struct audio_format_info *a = &afi[format];
-
- return (tv_diff(now, &a->restart_barrier, NULL) > 0)? 0 : 1;
-}
-
-static void open_current_receiver(void)
+static int open_current_receiver(struct sched *s)
{
int i;
+ struct timeval diff;
if (!af_status)
- return;
+ return 0;
i = get_audio_format_num(af_status);
if (i < 0)
- return;
- if (decoder_running(i) || is_frozen(i))
- return;
+ return 0;
+ if (decoder_running(i))
+ return 0;
+ if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) {
+ s->timeout = diff;
+ return 0;
+ }
open_receiver(i);
+ return 1;
}
static void compute_time_diff(const struct timeval *status_time)
count > 10? sign : sign * time_smooth, &diff,
&tmp);
sa_time_diff = tmp;
- PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
+ PARA_DEBUG_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
sign > 0? "+" : "-",
tv2ms(&diff),
sa_time_diff_sign ? "+" : "-",
return;
PARA_INFO_LOG("closing slot %d \n", slot_num);
wng_close(s->wng);
- wng_destroy(s->wng);
close_filters(s->fc);
free(s->fc);
close_receiver(slot_num);
clear_slot(slot_num);
}
+/*
+ * Check if any receivers/filters/writers need to be started and do so if
+ * neccessary. Since the pre_select function didn't have a chance yet to put
+ * file descriptors into the fd sets given by s, make the upcoming select()
+ * return immediately to avoid a long timeout in case we started something.
+ */
static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
{
int i;
+ struct timeval min_delay = {0, 1};
+ t->ret = 1;
now = &s->now;
- if (audiod_status != AUDIOD_ON)
- kill_all_decoders();
- else if (playing)
- open_current_receiver();
+ if (audiod_status != AUDIOD_ON || !playing)
+ return kill_all_decoders();
+ if (open_current_receiver(s))
+ s->timeout = min_delay;
FOR_EACH_SLOT(i) {
- struct receiver_node *rn;
+ struct slot_info *sl = &slot[i];
+ struct audio_format_info *a;
- try_to_close_slot(i);
- if (slot[i].format < 0)
+ if (sl->format < 0)
+ continue;
+ a = &afi[sl->format];
+ if (!sl->receiver_node)
+ continue;
+ if (!a->num_filters) {
+ if (sl->receiver_node->loaded && !sl->wng) {
+ open_writers(i);
+ s->timeout = min_delay;
+ }
continue;
- rn = slot[i].receiver_node;
- if (rn && rn->loaded && !slot[i].wng) {
+ }
+ if (sl->receiver_node->loaded && !sl->fc) {
open_filters(i);
+ s->timeout = min_delay;
+ continue;
+ }
+ if (sl->fc && *sl->fc->out_loaded && !sl->wng) {
open_writers(i);
+ s->timeout = min_delay;
}
}
}
static void audiod_post_select(struct sched *s, __a_unused struct task *t)
{
- /* only save away the current time for other users */
+ int i;
+
+ /* save away the current time for other users */
now = &s->now;
+ t->ret = 1;
+ FOR_EACH_SLOT(i)
+ try_to_close_slot(i);
}
static void init_audiod_task(struct task *t)
t->post_select = audiod_post_select;
t->event_handler = NULL;
t->private_data = t;
- t->flags = 0;
sprintf(t->status, "audiod task");
}
return ret;
}
+static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+{
+ char *tl = get_task_list();
+ int ret = 1;
+ if (tl)
+ ret = client_write(fd, tl);
+ free(tl);
+ if (ret > 0)
+ close(fd);
+ return ret;
+}
+
+static int com_kill(int fd, int argc, char **argv)
+{
+ int i, ret = 1;
+ if (argc < 2)
+ return -E_AUDIOD_SYNTAX;
+ for (i = 1; i < argc; i++) {
+ ret = kill_task(argv[i]);
+ if (ret < 0)
+ break;
+ }
+ if (ret > 0)
+ close(fd);
+ return ret;
+}
+
static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
{
int i, ret;
void signal_event_handler(struct task *t)
{
struct signal_task *st = t->private_data;
- handle_signal(st->signum);
+
+ if (t->ret != -E_SIGNAL_CAUGHT)
+ PARA_ERROR_LOG("%s (ignored)\n", PARA_STRERROR(-t->ret));
+ else
+ handle_signal(st->signum);
}
void signal_pre_select(struct sched *s, struct task *t)
st->task.pre_select = signal_pre_select;
st->task.post_select = signal_post_select;
st->task.private_data = st;
- st->task.flags = 0;
sprintf(st->task.status, "signal task");
}
static void command_pre_select(struct sched *s, struct task *t)
{
struct command_task *ct = t->private_data;
+ t->ret = 1;
para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
}
int ret;
struct command_task *ct = t->private_data;
+ t->ret = 1; /* always successful */
if (audiod_status != AUDIOD_OFF)
audiod_status_dump();
- t->ret = 1; /* always successful */
if (!FD_ISSET(ct->fd, &s->rfds))
return;
ret = handle_connect(ct->fd);
ct->task.post_select = command_post_select;
ct->task.event_handler = NULL;
ct->task.private_data = ct;
- ct->task.flags = 0;
ct->fd = audiod_get_socket(); /* doesn't return on errors */
sprintf(ct->task.status, "command task");
}
+static void status_event_handler(__a_unused struct task *t)
+{
+ struct timeval delay = {1, 0};
+ int i;
+ struct status_task *st = t->private_data;
+
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+ close_stat_pipe();
+ /* avoid busy loop if server is down */
+ tv_add(now, &delay, &st->restart_barrier);
+ FOR_EACH_AUDIO_FORMAT(i)
+ afi[i].restart_barrier = st->restart_barrier;
+}
+
static void status_pre_select(struct sched *s, struct task *t)
{
struct status_task *st = t->private_data;
t->ret = 1;
if (st->fd >= 0 && audiod_status == AUDIOD_OFF)
close_stat_pipe();
- if (st->fd < 0 && audiod_status != AUDIOD_OFF) {
+ if (st->fd < 0 && audiod_status != AUDIOD_OFF
+ && tv_diff(now, &st->restart_barrier, NULL) > 0) {
st->fd = open_stat_pipe();
st->loaded = 0;
st->buf[0] = '\0';
static void status_post_select(struct sched *s, struct task *t)
{
struct status_task *st = t->private_data;
- int ret;
t->ret = 1;
if (st->fd < 0 || !FD_ISSET(st->fd, &s->rfds))
return;
- ret = read(st->fd, st->buf + st->loaded,
- STRINGSIZE - 1 - st->loaded);
- if (ret <= 0) {
- close_stat_pipe();
- /* avoid busy loop if server is down */
- while (sleep(1) > 0) /* FIXME */
- ; /* try again*/
- } else {
- st->buf[ret + st->loaded] = '\0';
- st->loaded = for_each_line(st->buf, ret + st->loaded,
- &check_stat_line);
+ t->ret = read(st->fd, st->buf + st->loaded, STRINGSIZE - 1 - st->loaded);
+ if (t->ret <= 0) {
+ if (!t->ret)
+ t->ret = -E_STATUS_EOF;
+ return;
}
+ st->buf[t->ret + st->loaded] = '\0';
+ st->loaded = for_each_line(st->buf, t->ret + st->loaded,
+ &check_stat_line);
}
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.event_handler = status_event_handler;
st->task.private_data = st;
- st->task.flags = 0;
- st->loaded = 0;
st->fd = -1;
- st->buf[0] = '\0';
sprintf(st->task.status, "status task");
}
register_task(&cmd_task->task);
register_task(&stat_task->task);
register_task(audiod_task);
- s.default_timeout.tv_sec = 0;
+ s.default_timeout.tv_sec = 3;
s.default_timeout.tv_usec = 99 * 1000;
ret = sched(&s);
projects / paraslash.git / blobdiff