X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;fp=recv.c;h=d127882a8e02d72219140325460fd73d9e050794;hp=f28809da6c2b8c5b03f975e940cbe61cbdd4b27c;hb=0879c9de4eaf8c78131c243d8e9fec013df0d14a;hpb=0160a4e41a7985ee17e1732ea5e18604001d5726 diff --git a/recv.c b/recv.c index f28809da..d127882a 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) struct receiver_node rn; struct stdout_task sot = {.btrn = NULL}; static struct sched s; + struct task_info ti; recv_cmdline_parser(argc, argv, &conf); loglevel = get_loglevel_by_name(conf.loglevel_arg); @@ -91,17 +92,18 @@ int main(int argc, char *argv[]) sot.btrn = btr_new_node(&(struct btr_node_description) EMBRACE(.parent = rn.btrn, .name = "stdout")); - stdout_set_defaults(&sot); - register_task(&s, &sot.task); + stdout_task_register(&sot, &s); - rn.task.pre_select = r->pre_select; - rn.task.post_select = r->post_select; - sprintf(rn.task.status, "%s", r->name); - register_task(&s, &rn.task); + ti.name = r->name; + ti.pre_select = r->pre_select; + ti.post_select = r->post_select; + ti.context = &rn; + rn.task = task_register(&ti, &s); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; ret = schedule(&s); + sched_shutdown(&s); out: if (r_opened) r->close(&rn);