X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=27eba9e3e584cd06294bef568cc4eb19d1ce1f88;hp=456813b14a5a64d9b642dedbd261a2bec25285f8;hb=6793399f34237840fbf48220971966bc9a3d5a18;hpb=dd57999338292ecf28060b70137f980b8f307b34 diff --git a/audiod.c b/audiod.c index 456813b1..27eba9e3 100644 --- a/audiod.c +++ b/audiod.c @@ -110,6 +110,8 @@ struct status_task { struct timeval clock_diff_barrier; /** Number of the audio format as announced by para_server. */ int current_audio_format_num; + /* The status task btrn is the child of the client task. */ + struct btr_node *btrn; }; /** The array of status items sent by para_server. */ @@ -340,8 +342,12 @@ static void close_receiver(int slot_num) 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); } @@ -353,6 +359,7 @@ static void close_writers(struct slot_info *s) if (s->format < 0) return; + assert(s->wns); a = afi + s->format; if (a->num_writers == 0) writer_cleanup(s->wns); @@ -364,7 +371,7 @@ static void close_writers(struct slot_info *s) 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; @@ -372,15 +379,33 @@ static void _close_filters(struct slot_info *s) 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; @@ -393,12 +418,13 @@ static void kill_all_decoders(int error) 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); } } @@ -456,7 +482,11 @@ static void open_filters(struct slot_info *s) 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; @@ -509,7 +539,8 @@ static int open_receiver(int format) 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); @@ -593,12 +624,14 @@ static int open_current_receiver(struct sched *s) * 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; @@ -1001,6 +1034,7 @@ static void close_stat_pipe(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(); @@ -1052,12 +1086,17 @@ static bool try_to_close_slot(int slot_num) 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; @@ -1076,9 +1115,9 @@ static void start_stop_decoders(struct sched *s) 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; @@ -1092,8 +1131,17 @@ static void start_stop_decoders(struct sched *s) sched_min_delay(s); } -/* restart the client task if necessary */ static void status_pre_select(struct sched *s, struct task *t) +{ + struct status_task *st = container_of(t, struct status_task, task); + int ret; + + ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF); + sched_request_barrier(&st->restart_barrier, s); +} + +/* restart the client task if necessary */ +static void status_post_select(struct sched *s, struct task *t) { struct status_task *st = container_of(t, struct status_task, task); @@ -1101,7 +1149,7 @@ static void status_pre_select(struct sched *s, struct task *t) if (!st->ct) goto out; if (st->ct->task.error >= 0) { - st->ct->task.error = -E_AUDIOD_OFF; + kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF); goto out; } if (st->ct->task.error != -E_TASK_UNREGISTERED) @@ -1111,6 +1159,8 @@ static void status_pre_select(struct sched *s, struct task *t) goto out; } if (st->ct) { + char *buf; + size_t sz; int ret; if (st->ct->task.error < 0) { if (st->ct->task.error != -E_TASK_UNREGISTERED) @@ -1120,21 +1170,25 @@ static void status_pre_select(struct sched *s, struct task *t) } if (st->ct->status != CL_RECEIVING) goto out; - ret = for_each_stat_item(st->ct->buf, st->ct->loaded, - update_item); + ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF); + if (ret <= 0) + goto out; + sz = btr_next_buffer(st->btrn, &buf); + ret = for_each_stat_item(buf, sz, update_item); if (ret < 0) { - st->ct->task.error = ret; + kill_btrn(st->ct->btrn, &st->ct->task, ret); goto out; } - if (st->ct->loaded != ret) { + if (sz != ret) st->last_status_read = *now; - st->ct->loaded = ret; - } else { + else { struct timeval diff; tv_diff(now, &st->last_status_read, &diff); if (diff.tv_sec > 61) - st->ct->task.error = -E_STATUS_TIMEOUT; + kill_btrn(st->ct->btrn, &st->ct->task, + -E_STATUS_TIMEOUT); } + btr_consume(st->btrn, sz - ret); goto out; } if (tv_diff(now, &st->restart_barrier, NULL) < 0) @@ -1144,14 +1198,14 @@ static void status_pre_select(struct sched *s, struct task *t) 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); + client_open(argc, argv, &st->ct, NULL, NULL, st->btrn); set_stat_task_restart_barrier(2); sched_min_delay(s); } else { char *argv[] = {"audiod", "--", "stat", "-p", NULL}; int argc = 4; - client_open(argc, argv, &st->ct, NULL); + client_open(argc, argv, &st->ct, NULL, NULL, st->btrn); set_stat_task_restart_barrier(5); sched_min_delay(s); } @@ -1168,10 +1222,13 @@ 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->sa_time_diff_sign = 1; st->clock_diff_count = conf.clock_diff_count_arg; st->current_audio_format_num = -1; - sprintf(st->task.status, "status task"); + sprintf(st->task.status, "stat"); + st->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stat")); } static void set_initial_status(void)