X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=file_write.c;h=7a24b3ac6b78e9d56b1f194c0479c3584cabbfb3;hp=d7cea2f9efd8aa1d0922b4a9442d2126462dd1e8;hb=e7e55d0ad711a46e4768066be197bb41caa5c5eb;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde diff --git a/file_write.c b/file_write.c index d7cea2f9..7a24b3ac 100644 --- a/file_write.c +++ b/file_write.c @@ -1,18 +1,24 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file file_write.c simple output plugin for testing purposes */ +#include #include #include +#include +#include #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" @@ -26,26 +32,43 @@ struct private_file_write_data { int check_fd; }; +/* + * Get a random filename. + * + * This is by no means a secure way to create temporary files in a hostile + * directory like \p /tmp. However, we use it only for creating temp files in + * ~/.paraslash, for which it is OK. Result must be freed by the caller. + */ +__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, + para_random(99999999)); + free(home); + return result; +} + static int file_write_open(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; + if (conf->filename_given) filename = conf->filename_arg; - else { - char *tmp = para_tmpname(), *home = para_homedir(); - filename = make_message("%s/.paraslash/%s", home, tmp); - free(home); - free(tmp); - } + else + filename = random_filename(); wn->private_data = pfwd; pfwd->fd = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); if (!conf->filename_given) free(filename); if (pfwd->fd >= 0) - return 8192; + return 1; free(pfwd); return -E_FW_OPEN; } @@ -65,6 +88,24 @@ static int file_write_pre_select(struct sched *s, struct writer_node *wn) return 1; } +static void file_write_pre_select_btr(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; + + t->error = 0; + pfwd->check_fd = 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); + pfwd->check_fd = 1; + } else if (ret < 0) { + s->timeout.tv_sec = 0; + s->timeout.tv_usec = 1; + } +} + static int file_write_post_select(struct sched *s, struct writer_node *wn) { struct private_file_write_data *pfwd = wn->private_data; @@ -78,7 +119,7 @@ static int file_write_post_select(struct sched *s, struct writer_node *wn) if (!FD_ISSET(pfwd->fd, &s->wfds)) return 1; // PARA_INFO_LOG("writing %zd\n", *wng->loaded); - ret = write(pfwd->fd, wng->buf + wn->written, + ret = write(pfwd->fd, *wng->bufp + wn->written, *wng->loaded - wn->written); if (ret < 0) return -E_FW_WRITE; @@ -89,16 +130,51 @@ static int file_write_post_select(struct sched *s, struct writer_node *wn) static void file_write_close(struct writer_node *wn) { struct private_file_write_data *pfwd = wn->private_data; + close(pfwd->fd); + file_cmdline_parser_free(wn->conf); free(pfwd); } +static void file_write_post_select_btr(__a_unused 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; + struct btr_node *btrn = wn->btrn; + int ret; + char *buf; + size_t bytes; + + t->error = 0; + ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); + if (ret == 0) + return; + if (ret < 0) + goto err; + if (!pfwd->check_fd) + return; + if (!FD_ISSET(pfwd->fd, &s->wfds)) + return; + bytes = btr_next_buffer(btrn, &buf); + assert(bytes > 0); + //PARA_INFO_LOG("writing %zu\n", bytes); + ret = write(pfwd->fd, buf, bytes); + if (ret < 0) + goto err; + btr_consume(btrn, ret); + return; +err: + assert(ret < 0); + t->error = ret; +} + __malloc static void *file_write_parse_config(const char *options) { - PARA_INFO_LOG("options: %s\n", 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; @@ -106,13 +182,29 @@ __malloc static void *file_write_parse_config(const char *options) return NULL; } +static void file_write_free_config(void *conf) +{ + file_cmdline_parser_free(conf); +} + /** 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->pre_select_btr = file_write_pre_select_btr; w->post_select = file_write_post_select; + w->post_select_btr = file_write_post_select_btr; 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); }