}
if (audiod_status == AUDIOD_ON && !s)
goto empty;
- /* valid status items and playing */
+ /*
+ * Valid status items and playing, set length and tmp to the stream
+ * start. We use the slot info and fall back to the info from current
+ * status items if no slot info is available.
+ */
+ length = stat_task->length_seconds;
+ tmp = &stat_task->server_stream_start;
if (s && s->wns) { /* writer active in this slot */
- length = s->seconds_total;
- tmp = &s->server_stream_start;
- } else { /* standby mode, rely on status items */
- length = stat_task->length_seconds;
- tmp = &stat_task->server_stream_start;
+ btr_get_node_start(s->wns[0].btrn, &wstime);
+ if (wstime.tv_sec != 0) { /* writer wrote something */
+ if (s->server_stream_start.tv_sec == 0) {
+ /* copy status info to slot */
+ s->server_stream_start = stat_task->server_stream_start;
+ s->offset_seconds = stat_task->offset_seconds;
+ s->seconds_total = stat_task->length_seconds;
+ }
+ length = s->seconds_total;
+ tmp = &s->server_stream_start;
+ }
}
if (stat_task->sa_time_diff_sign > 0)
tv_diff(tmp, &stat_task->sa_time_diff, &sss);
seconds = diff.tv_sec + stat_task->offset_seconds;
goto out;
}
- btr_get_node_start(s->wns[0].btrn, &wstime);
tv_diff(now, &wstime, &wtime);
//PARA_CRIT_LOG("offset %d\n", s->offset_seconds);
seconds = s->offset_seconds;
static void writer_cleanup(struct writer_node *wn)
{
- struct writer *w = writers + wn->writer_num;
+ struct writer *w;
+ if (!wn)
+ return;
+ w = writers + wn->writer_num;
+ PARA_INFO_LOG("closing %s\n", writer_names[wn->writer_num]);
w->close(wn);
btr_free_node(wn->btrn);
}
s->wns = NULL;
}
-static void _close_filters(struct slot_info *s)
+static void close_filters(struct slot_info *s)
{
int i;
struct audio_format_info *a = afi + s->format;
return;
for (i = 0; i < a->num_filters; i++) {
struct filter_node *fn = s->fns + i;
- struct filter *f = filters + fn->filter_num;
+ struct filter *f;
- f->close(fn);
+ if (!fn)
+ continue;
+ f = filters + fn->filter_num;
+ if (f->close)
+ f->close(fn);
btr_free_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)
{
int i, j;
a = afi + s->format;
if (s->wns)
for (j = 0; j < a->num_writers; j++)
- s->wns[j].task.error = error;
+ kill_btrn(s->wns[j].btrn, &s->wns[j].task, error);
if (s->fns)
for (j = 0; j < a->num_writers; j++)
- s->fns[j].task.error = error;
+ kill_btrn(s->fns[j].btrn, &s->wns[j].task, error);
if (s->receiver_node)
- s->receiver_node->task.error = error;
+ kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
+ error);
}
}
fn->conf = a->filter_conf[i];
fn->task.pre_select = f->pre_select;
fn->task.post_select = f->post_select;
- fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
+
+ fn->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = f->name, .parent = parent,
+ .handler = f->execute, .context = fn));
+
f->open(fn);
register_task(&fn->task);
parent = fn->btrn;
register_writer_node(wn, parent);
}
}
- s->server_stream_start = stat_task->server_stream_start.tv_sec?
- stat_task->server_stream_start : *now;
- s->offset_seconds = stat_task->offset_seconds;
- s->seconds_total = stat_task->length_seconds;
}
/* returns slot num on success */
rn = s->receiver_node;
rn->receiver = r;
rn->conf = a->receiver_conf;
- rn->btrn = btr_new_node(r->name, NULL, NULL, rn);
+ rn->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = r->name, .context = rn));
ret = r->open(rn);
if (ret < 0) {
btr_free_node(rn->btrn);
* this period begins to avoid restarting the receiver that
* belongs to the file just completed.
*/
- if (stat_task->server_stream_start.tv_sec != 0)
+ if (stat_task->server_stream_start.tv_sec != 0) {
sched_request_timeout_ms(100, s);
+ return -1;
+ }
}
if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
if (tv_diff(&s->timeout, &diff, NULL) > 0)
- s->timeout = diff;
+ sched_request_timeout(&diff, s);
else
sched_min_delay(s);
return -1;
for (i = 0; i < a->num_filters; i++)
if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
return false;
- for (i = 0; i < a->num_writers; i++)
- if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+ if (a->num_writers > 0) {
+ for (i = 0; i < a->num_writers; i++)
+ if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+ return false;
+ } else {
+ if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
return false;
+ }
PARA_INFO_LOG("closing slot %d\n", slot_num);
close_writers(s);
- _close_filters(s);
+ close_filters(s);
close_receiver(slot_num);
clear_slot(slot_num);
return true;
FOR_EACH_SLOT(i)
if (try_to_close_slot(i))
sched_min_delay(s);
-// if (audiod_status != AUDIOD_ON ||
-// !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
-// return kill_all_decoders(-E_NOT_PLAYING);
+ if (audiod_status != AUDIOD_ON ||
+ !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
+ return kill_all_decoders(-E_NOT_PLAYING);
ret = open_current_receiver(s);
if (ret < 0)
return;
projects / paraslash.git / blobdiff