X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=4d2017dbed798d045f3c2727debc64ef5d4238eb;hp=b37de5b726b3203d27eed4c99281948d67a67ed3;hb=4d4e80f2b4260f2c8b37a8612ce655502a799f7a;hpb=b0fe421a6a0487ff71f6f903908f666d9ca1b327 diff --git a/filesetup.c b/filesetup.c index b37de5b7..4d2017db 100644 --- a/filesetup.c +++ b/filesetup.c @@ -8,6 +8,8 @@ #include #include "fio.h" +#include "smalloc.h" +#include "filehash.h" static int root_warn; @@ -214,6 +216,9 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f) int ret = 0; dprint(FD_FILE, "fd close %s\n", f->file_name); + + remove_file_hash(f); + if (close(f->fd) < 0) ret = errno; @@ -221,10 +226,36 @@ int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f) return ret; } +static int file_lookup_open(struct fio_file *f, int flags) +{ + struct fio_file *__f; + int from_hash; + + __f = lookup_file_hash(f->file_name); + if (__f) { + /* + * racy, need the __f->lock locked + */ + f->lock = __f->lock; + f->lock_owner = __f->lock_owner; + f->lock_batch = __f->lock_batch; + f->lock_ddir = __f->lock_ddir; + f->fd = dup(__f->fd); + f->references++; + from_hash = 1; + } else { + f->fd = open(f->file_name, flags, 0600); + from_hash = 0; + } + + return from_hash; +} + int generic_open_file(struct thread_data *td, struct fio_file *f) { int is_std = 0; int flags = 0; + int from_hash = 0; dprint(FD_FILE, "fd open %s\n", f->file_name); @@ -261,7 +292,7 @@ open_again: if (is_std) f->fd = dup(STDOUT_FILENO); else - f->fd = open(f->file_name, flags, 0600); + from_hash = file_lookup_open(f, flags); } else { if (f->filetype == FIO_TYPE_CHAR && !read_only) flags |= O_RDWR; @@ -271,7 +302,7 @@ open_again: if (is_std) f->fd = dup(STDIN_FILENO); else - f->fd = open(f->file_name, flags); + from_hash = file_lookup_open(f, flags); } if (f->fd == -1) { @@ -291,6 +322,18 @@ open_again: if (get_file_size(td, f)) goto err; + if (!from_hash && f->fd != -1) { + if (add_file_hash(f)) { + int ret; + + /* + * OK to ignore, we haven't done anything with it + */ + ret = generic_close_file(td, f); + goto open_again; + } + } + return 0; err: close(f->fd); @@ -508,13 +551,12 @@ int init_random_map(struct thread_data *td) for_each_file(td, f, i) { blocks = (f->real_file_size + td->o.rw_min_bs - 1) / (unsigned long long) td->o.rw_min_bs; num_maps = (blocks + BLOCKS_PER_MAP-1)/ (unsigned long long) BLOCKS_PER_MAP; - f->file_map = malloc(num_maps * sizeof(long)); + f->file_map = smalloc(num_maps * sizeof(long)); if (!f->file_map) { log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n"); return 1; } f->num_maps = num_maps; - memset(f->file_map, 0, num_maps * sizeof(long)); } return 0; @@ -542,13 +584,14 @@ void close_and_free_files(struct thread_data *td) td_io_close_file(td, f); - free(f->file_name); + sfree(f->file_name); f->file_name = NULL; if (f->file_map) { - free(f->file_map); + sfree(f->file_map); f->file_map = NULL; } + sfree(f); } td->o.filename = NULL; @@ -585,8 +628,7 @@ int add_file(struct thread_data *td, const char *fname) dprint(FD_FILE, "add file %s\n", fname); - f = malloc(sizeof(*f)); - memset(f, 0, sizeof(*f)); + f = smalloc(sizeof(*f)); f->fd = -1; td->files = realloc(td->files, (cur_files + 1) * sizeof(f)); @@ -603,10 +645,24 @@ int add_file(struct thread_data *td, const char *fname) len = sprintf(file_name, "%s/", td->o.directory); sprintf(file_name + len, "%s", fname); - f->file_name = strdup(file_name); + f->file_name = smalloc_strdup(file_name); get_file_type(f); + switch (td->o.file_lock_mode) { + case FILE_LOCK_NONE: + break; + case FILE_LOCK_READWRITE: + f->lock = fio_mutex_rw_init(); + break; + case FILE_LOCK_EXCLUSIVE: + f->lock = fio_mutex_init(1); + break; + default: + log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode); + assert(0); + } + td->files_index++; if (f->filetype == FIO_TYPE_FILE) td->nr_normal_files++; @@ -645,12 +701,62 @@ int put_file(struct thread_data *td, struct fio_file *f) return ret; } -void lock_file(struct thread_data *td, struct fio_file *f) +void lock_file(struct thread_data *td, struct fio_file *f, enum fio_ddir ddir) { + if (!f->lock || td->o.file_lock_mode == FILE_LOCK_NONE) + return; + + if (f->lock_owner == td && f->lock_batch--) + return; + + if (td->o.file_lock_mode == FILE_LOCK_READWRITE) { + if (ddir == DDIR_READ) + fio_mutex_down_read(f->lock); + else + fio_mutex_down_write(f->lock); + } else if (td->o.file_lock_mode == FILE_LOCK_EXCLUSIVE) + fio_mutex_down(f->lock); + + f->lock_owner = td; + f->lock_batch = td->o.lockfile_batch; + f->lock_ddir = ddir; +} + +void unlock_file(struct thread_data *td, struct fio_file *f) +{ + if (!f->lock || td->o.file_lock_mode == FILE_LOCK_NONE) + return; + if (f->lock_batch) + return; + + if (td->o.file_lock_mode == FILE_LOCK_READWRITE) { + const int is_read = f->lock_ddir == DDIR_READ; + int val = fio_mutex_getval(f->lock); + + if ((is_read && val == 1) || (!is_read && val == -1)) + f->lock_owner = NULL; + + if (is_read) + fio_mutex_up_read(f->lock); + else + fio_mutex_up_write(f->lock); + } else if (td->o.file_lock_mode == FILE_LOCK_EXCLUSIVE) { + int val = fio_mutex_getval(f->lock); + + if (val == 0) + f->lock_owner = NULL; + + fio_mutex_up(f->lock); + } } -void unlock_file(struct fio_file *f) +void unlock_file_all(struct thread_data *td, struct fio_file *f) { + if (f->lock_owner != td) + return; + + f->lock_batch = 0; + unlock_file(td, f); } static int recurse_dir(struct thread_data *td, const char *dirname) @@ -726,11 +832,10 @@ void dup_files(struct thread_data *td, struct thread_data *org) for_each_file(td, f, i) { struct fio_file *__f; - __f = malloc(sizeof(*__f)); - memset(f, 0, sizeof(*__f)); + __f = smalloc(sizeof(*__f)); if (f->file_name) - __f->file_name = strdup(f->file_name); + __f->file_name = smalloc_strdup(f->file_name); td->files[i] = __f; }