X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=13008c2dd4dcce7850b7fdd508dea827790d1787;hp=debf07671f17ed132690b74e3cde2246428889d0;hb=83ab4b5d38bb63cf4724022c3804d3eaa2ac51d3;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953 diff --git a/file_write.c b/file_write.c index debf0767..13008c2d 100644 --- a/file_write.c +++ b/file_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Andre Noll + * Copyright (C) 2006-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -110,7 +110,9 @@ static void file_write_post_select(__a_unused struct sched *s, char *buf; size_t bytes; - t->error = 0; + ret = task_get_notification(t); + if (ret < 0) + goto out; ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); if (ret <= 0) goto out; @@ -129,22 +131,22 @@ static void file_write_post_select(__a_unused struct sched *s, btr_consume(btrn, ret); out: if (ret < 0) - btr_remove_node(btrn); + btr_remove_node(&wn->btrn); t->error = ret; } -__malloc static void *file_write_parse_config_or_die(const char *options) +__malloc static void *file_write_parse_config_or_die(int argc, char **argv) { struct file_write_args_info *conf = para_calloc(sizeof(*conf)); /* exits on errors */ - file_cmdline_parser_string(options, conf, "file_write"); + file_write_cmdline_parser(argc, argv, conf); return conf; } static void file_write_free_config(void *conf) { - file_cmdline_parser_free(conf); + file_write_cmdline_parser_free(conf); } /** the init function of the file writer */ @@ -152,16 +154,15 @@ void file_write_init(struct writer *w) { struct file_write_args_info dummy; - file_cmdline_parser_init(&dummy); + file_write_cmdline_parser_init(&dummy); w->pre_select = file_write_pre_select; w->post_select = file_write_post_select; w->parse_config_or_die = file_write_parse_config_or_die; w->free_config = file_write_free_config; w->close = file_write_close; - w->shutdown = NULL; /* nothing to do */ w->help = (struct ggo_help) { .short_help = file_write_args_info_help, .detailed_help = file_write_args_info_detailed_help }; - file_cmdline_parser_free(&dummy); + file_write_cmdline_parser_free(&dummy); }