X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=bf56112b72b9784cf32583ebc0dbba72324b9f86;hp=db80a8b7e28ba2392de54eab64bf2fe1b693fbc6;hb=b8ba87ac231c3facccb1e5b0e8b1b88dd162f8f3;hpb=190b8f0c9c1c1a99ed26fd953f7af9023f9533ee diff --git a/filesetup.c b/filesetup.c index db80a8b7..bf56112b 100644 --- a/filesetup.c +++ b/filesetup.c @@ -38,7 +38,7 @@ static int extend_file(struct thread_data *td, struct fio_file *f) int r, new_layout = 0, unlink_file = 0, flags; unsigned long long left; unsigned int bs; - char *b; + char *b = NULL; if (read_only) { log_err("fio: refusing extend of file due to read-only\n"); @@ -189,12 +189,14 @@ done: err: close(f->fd); f->fd = -1; + if (b) + free(b); return 1; } static int pre_read_file(struct thread_data *td, struct fio_file *f) { - int r, did_open = 0, old_runstate; + int ret = 0, r, did_open = 0, old_runstate; unsigned long long left; unsigned int bs; char *b; @@ -216,7 +218,13 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f) b = malloc(bs); memset(b, 0, bs); - lseek(f->fd, f->file_offset, SEEK_SET); + if (lseek(f->fd, f->file_offset, SEEK_SET) < 0) { + td_verror(td, errno, "lseek"); + log_err("fio: failed to lseek pre-read file\n"); + ret = 1; + goto error; + } + left = f->io_size; while (left && !td->terminate) { @@ -234,12 +242,14 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f) } } +error: td_restore_runstate(td, old_runstate); if (did_open) td->io_ops->close_file(td, f); + free(b); - return 0; + return ret; } static unsigned long long get_rand_file_size(struct thread_data *td) @@ -387,9 +397,6 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, dprint(FD_IO, "invalidate cache %s: %llu/%llu\n", f->file_name, off, len); - /* - * FIXME: add blockdev flushing too - */ if (f->mmap_ptr) { ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED); #ifdef FIO_MADV_FREE @@ -411,15 +418,18 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, } else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE) ret = 0; - if (ret < 0) { - td_verror(td, errno, "invalidate_cache"); - return 1; - } else if (ret > 0) { - td_verror(td, ret, "invalidate_cache"); - return 1; + /* + * Cache flushing isn't a fatal condition, and we know it will + * happen on some platforms where we don't have the proper + * function to flush eg block device caches. So just warn and + * continue on our way. + */ + if (ret) { + log_info("fio: cache invalidation of %s failed: %s\n", f->file_name, strerror(errno)); + ret = 0; } - return ret; + return 0; } @@ -798,7 +808,7 @@ int setup_files(struct thread_data *td) * Calculate per-file size and potential extra size for the * first files, if needed. */ - if (!o->file_size_low) { + if (!o->file_size_low && o->nr_files) { uint64_t all_fs; fs = o->size / o->nr_files; @@ -1109,47 +1119,89 @@ static void get_file_type(struct fio_file *f) } } -static void set_already_allocated(const char *fname) +static int __is_already_allocated(const char *fname) { - struct file_name *fn; + struct flist_head *entry; + char *filename; - fn = malloc(sizeof(struct file_name)); - fn->filename = strdup(fname); - flist_add_tail(&fn->list, &filename_list); + if (flist_empty(&filename_list)) + return 0; + + flist_for_each(entry, &filename_list) { + filename = flist_entry(entry, struct file_name, list)->filename; + + if (strcmp(filename, fname) == 0) + return 1; + } + + return 0; } static int is_already_allocated(const char *fname) { - struct flist_head *entry; - char *filename; + int ret; - if (!flist_empty(&filename_list)) - { - flist_for_each(entry, &filename_list) { - filename = flist_entry(entry, struct file_name, list)->filename; + fio_file_hash_lock(); + ret = __is_already_allocated(fname); + fio_file_hash_unlock(); + return ret; +} - if (strcmp(filename, fname) == 0) - return 1; - } +static void set_already_allocated(const char *fname) +{ + struct file_name *fn; + + fn = malloc(sizeof(struct file_name)); + fn->filename = strdup(fname); + + fio_file_hash_lock(); + if (!__is_already_allocated(fname)) { + flist_add_tail(&fn->list, &filename_list); + fn = NULL; } + fio_file_hash_unlock(); - return 0; + if (fn) { + free(fn->filename); + free(fn); + } } + static void free_already_allocated(void) { struct flist_head *entry, *tmp; struct file_name *fn; - if (!flist_empty(&filename_list)) - { - flist_for_each_safe(entry, tmp, &filename_list) { - fn = flist_entry(entry, struct file_name, list); - free(fn->filename); - flist_del(&fn->list); - free(fn); - } + if (flist_empty(&filename_list)) + return; + + fio_file_hash_lock(); + flist_for_each_safe(entry, tmp, &filename_list) { + fn = flist_entry(entry, struct file_name, list); + free(fn->filename); + flist_del(&fn->list); + free(fn); + } + + fio_file_hash_unlock(); +} + +static struct fio_file *alloc_new_file(struct thread_data *td) +{ + struct fio_file *f; + + f = smalloc(sizeof(*f)); + if (!f) { + log_err("fio: smalloc OOM\n"); + assert(0); + return NULL; } + + f->fd = -1; + f->shadow_fd = -1; + fio_file_reset(td, f); + return f; } int add_file(struct thread_data *td, const char *fname, int numjob, int inc) @@ -1170,15 +1222,7 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc) if (numjob && is_already_allocated(file_name)) return 0; - f = smalloc(sizeof(*f)); - if (!f) { - log_err("fio: smalloc OOM\n"); - assert(0); - } - - f->fd = -1; - f->shadow_fd = -1; - fio_file_reset(td, f); + f = alloc_new_file(td); if (td->files_size <= td->files_index) { unsigned int new_size = td->o.nr_files + 1; @@ -1237,13 +1281,6 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc) set_already_allocated(file_name); - /* - * For adding files after the fact - if openfiles= isn't - * given as an option, ensure we allow at least one file open - */ - if (!td->o.open_files) - td->o.open_files = 1; - if (inc) td->o.nr_files++; @@ -1367,7 +1404,8 @@ static int recurse_dir(struct thread_data *td, const char *dirname) if (lstat(full_path, &sb) == -1) { if (errno != ENOENT) { td_verror(td, errno, "stat"); - return 1; + ret = 1; + break; } } @@ -1415,13 +1453,7 @@ void dup_files(struct thread_data *td, struct thread_data *org) for_each_file(org, f, i) { struct fio_file *__f; - __f = smalloc(sizeof(*__f)); - if (!__f) { - log_err("fio: smalloc OOM\n"); - assert(0); - } - __f->fd = -1; - fio_file_reset(td, __f); + __f = alloc_new_file(td); if (f->file_name) { __f->file_name = smalloc_strdup(f->file_name);