X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=9817571570e0dac6975a983845ff545523781325;hp=7bc1e437ea8975a2e97221754a85b00577e4bef4;hb=8fa50e3e39b4f65dea2a694dc064038a41036642;hpb=d56a8447f418cf9046077e743772a416b6f7b826 diff --git a/file_write.c b/file_write.c index 7bc1e437..98175715 100644 --- a/file_write.c +++ b/file_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Andre Noll + * Copyright (C) 2006-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,9 +8,7 @@ #include #include -#include #include -#include #include "para.h" #include "list.h" @@ -50,20 +48,12 @@ __must_check __malloc static char *random_filename(void) return result; } -static void file_write_open(struct writer_node *wn) -{ - struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd)); - - wn->private_data = pfwd; - pfwd->fd = -1; -} - static int prepare_output_file(struct writer_node *wn) { struct file_write_args_info *conf = wn->conf; - struct private_file_write_data *pfwd = wn->private_data; char *filename; int ret; + struct private_file_write_data *pfwd = para_calloc(sizeof(*pfwd)); if (conf->filename_given) filename = conf->filename_arg; @@ -76,8 +66,11 @@ static int prepare_output_file(struct writer_node *wn) goto out; pfwd->fd = ret; ret = mark_fd_blocking(pfwd->fd); - if (ret >= 0) - return 1; + if (ret < 0) + goto out_close; + wn->private_data = pfwd; + return 1; +out_close: close(pfwd->fd); out: free(pfwd); @@ -88,22 +81,22 @@ static void file_write_pre_select(struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); struct private_file_write_data *pfwd = wn->private_data; - int ret; + int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); - t->error = 0; - ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); - if (ret > 0 && pfwd->fd >= 0) - para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno); - else if (ret != 0) /* error or bos and fd not yet open */ - sched_min_delay(s); + if (ret == 0) + return; + if (ret < 0 || !pfwd) + return sched_min_delay(s); + para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno); } static void file_write_close(struct writer_node *wn) { struct private_file_write_data *pfwd = wn->private_data; - if (pfwd->fd >= 0) - close(pfwd->fd); + if (!pfwd) + return; + close(pfwd->fd); free(pfwd); } @@ -121,10 +114,9 @@ static void file_write_post_select(__a_unused struct sched *s, ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); if (ret <= 0) goto out; - if (pfwd->fd < 0) { + if (!pfwd) { ret = prepare_output_file(wn); - if (ret < 0) - goto out; + goto out; } if (!FD_ISSET(pfwd->fd, &s->wfds)) return; @@ -137,16 +129,16 @@ 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_cmdline_parser(argc, argv, conf); return conf; } @@ -161,13 +153,11 @@ void file_write_init(struct writer *w) struct file_write_args_info dummy; file_cmdline_parser_init(&dummy); - w->open = file_write_open; 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