X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=9837e810278ee220fce4a313d695db3b9772f3ad;hp=0cee535aa92ff9b5aaba1b815c8e8c95e0dd4731;hb=e79198e9851faddfd64e47654b5bc66fbc574255;hpb=ffb2eaa90429f6d5c3d369509efcdf91c5463dad diff --git a/file_write.c b/file_write.c index 0cee535a..9837e810 100644 --- a/file_write.c +++ b/file_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,20 +8,16 @@ #include #include -#include -#include -#include +#include +#include "write_cmd.lsg.h" #include "para.h" #include "list.h" #include "sched.h" -#include "ggo.h" #include "buffer_tree.h" #include "write.h" -#include "write_common.h" #include "string.h" #include "fd.h" -#include "file_write.cmdline.h" #include "error.h" /** Data specific to the file writer. */ @@ -40,129 +36,103 @@ struct private_file_write_data { __must_check __malloc static char *random_filename(void) { char *result, *home = para_homedir(); - struct timeval tv; - gettimeofday(&tv, NULL); - srandom(tv.tv_usec); - result = make_message("%s/.paraslash/%08lu", home, + srandom(clock_get_realtime(NULL)->tv_usec); + result = make_message("%s/.paraslash/%08ld", home, para_random(99999999)); free(home); return result; } -static int file_write_open(struct writer_node *wn) +static int prepare_output_file(struct writer_node *wn) { - struct private_file_write_data *pfwd = para_calloc( - sizeof(struct private_file_write_data)); - struct file_write_args_info *conf = wn->conf; - char *filename; - int ret; - - if (conf->filename_given) - filename = conf->filename_arg; - else - filename = random_filename(); - wn->private_data = pfwd; - ret = para_open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (!conf->filename_given) - free(filename); + const unsigned flags = O_WRONLY | O_CREAT, mode = S_IRUSR | S_IWUSR; + int ret, fd; + struct private_file_write_data *pfwd; + + + if (WRITE_CMD_OPT_GIVEN(FILE, FILENAME, wn->lpr)) { + const char *path = WRITE_CMD_OPT_STRING_VAL(FILE, FILENAME, + wn->lpr); + ret = para_open(path, flags, mode); + } else { + char *path = random_filename(); + ret = para_open(path, flags, mode); + free(path); + } if (ret < 0) - goto out; - pfwd->fd = ret; - ret = mark_fd_blocking(pfwd->fd); - if (ret >= 0) - return 1; - close(pfwd->fd); -out: - free(pfwd); - return ret; + return ret; + fd = ret; + ret = mark_fd_blocking(fd); + if (ret < 0) { + close(fd); + return ret; + } + pfwd = wn->private_data = para_calloc(sizeof(*pfwd)); + pfwd->fd = fd; + return 1; } -static void file_write_pre_select(struct sched *s, struct task *t) +static void file_write_pre_select(struct sched *s, void *context) { - struct writer_node *wn = container_of(t, struct writer_node, task); + struct writer_node *wn = context; 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) - para_fd_set(pfwd->fd, &s->wfds, &s->max_fileno); - else if (ret < 0) - 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) + return; close(pfwd->fd); free(pfwd); } -static void file_write_post_select(__a_unused struct sched *s, - struct task *t) +static int file_write_post_select(__a_unused struct sched *s, void *context) { - struct writer_node *wn = container_of(t, struct writer_node, task); + struct writer_node *wn = context; struct private_file_write_data *pfwd = wn->private_data; struct btr_node *btrn = wn->btrn; int ret; char *buf; size_t bytes; - t->error = 0; + ret = task_get_notification(wn->task); + if (ret < 0) + goto out; ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); if (ret <= 0) goto out; + if (!pfwd) { + ret = prepare_output_file(wn); + goto out; + } if (!FD_ISSET(pfwd->fd, &s->wfds)) - return; + return 0; bytes = btr_next_buffer(btrn, &buf); assert(bytes > 0); //PARA_INFO_LOG("writing %zu\n", bytes); - ret = write(pfwd->fd, buf, bytes); + ret = xwrite(pfwd->fd, buf, bytes); if (ret < 0) goto out; btr_consume(btrn, ret); out: if (ret < 0) - btr_remove_node(btrn); - t->error = ret; -} - -__malloc static void *file_write_parse_config(const char *options) -{ - struct file_write_args_info *conf - = para_calloc(sizeof(struct file_write_args_info)); - int ret = file_cmdline_parser_string(options, conf, "file_write"); - - PARA_INFO_LOG("conf->filename_given: %d\n", conf->filename_given); - if (!ret) - return conf; - free(conf); - return NULL; -} - -static void file_write_free_config(void *conf) -{ - file_cmdline_parser_free(conf); + btr_remove_node(&wn->btrn); + return ret; } /** the init function of the file writer */ -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 = file_write_parse_config; - 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); -} +struct writer lsg_write_cmd_com_file_user_data = { + .pre_select = file_write_pre_select, + .post_select = file_write_post_select, + .close = file_write_close, +};