X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=446eeaf0801a2772470bb2a47cde0c5368a67d70;hp=ec5d781ed0dea0e8c98c5a05289340969123e4c5;hb=f3e8440f75f98ced28cdd19ba785718e734cf7c5;hpb=2e3bd4c21cc239fbda992a4ede89ebb85f550920 diff --git a/filesetup.c b/filesetup.c index ec5d781e..446eeaf0 100644 --- a/filesetup.c +++ b/filesetup.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -10,6 +11,11 @@ #include "fio.h" #include "smalloc.h" #include "filehash.h" +#include "os/os.h" + +#ifdef FIO_HAVE_LINUX_FALLOCATE +#include +#endif static int root_warn; @@ -65,18 +71,42 @@ static int extend_file(struct thread_data *td, struct fio_file *f) } #ifdef FIO_HAVE_FALLOCATE - if (td->o.fallocate && !td->o.fill_device) { - dprint(FD_FILE, "fallocate file %s size %llu\n", f->file_name, - f->real_file_size); - - r = posix_fallocate(f->fd, 0, f->real_file_size); - if (r < 0) { - log_err("fio: posix_fallocate fails: %s\n", - strerror(-r)); + if (!td->o.fill_device) { + switch (td->o.fallocate_mode) { + case FIO_FALLOCATE_NONE: + break; + case FIO_FALLOCATE_POSIX: + dprint(FD_FILE, "posix_fallocate file %s size %llu\n", + f->file_name, f->real_file_size); + + r = posix_fallocate(f->fd, 0, f->real_file_size); + if (r > 0) { + log_err("fio: posix_fallocate fails: %s\n", + strerror(r)); + } + break; +#ifdef FIO_HAVE_LINUX_FALLOCATE + case FIO_FALLOCATE_KEEP_SIZE: + dprint(FD_FILE, + "fallocate(FALLOC_FL_KEEP_SIZE) " + "file %s size %llu\n", + f->file_name, f->real_file_size); + + r = fallocate(f->fd, FALLOC_FL_KEEP_SIZE, 0, + f->real_file_size); + if (r != 0) { + td_verror(td, errno, "fallocate"); + } + break; +#endif /* FIO_HAVE_LINUX_FALLOCATE */ + default: + log_err("fio: unknown fallocate mode: %d\n", + td->o.fallocate_mode); + assert(0); } } -#endif - +#endif /* FIO_HAVE_FALLOCATE */ + if (!new_layout) goto done; @@ -206,11 +236,18 @@ static int pre_read_file(struct thread_data *td, struct fio_file *f) static unsigned long long get_rand_file_size(struct thread_data *td) { unsigned long long ret, sized; - long r; + unsigned long r; + + if (td->o.use_os_rand) { + r = os_random_long(&td->file_size_state); + sized = td->o.file_size_high - td->o.file_size_low; + ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0))); + } else { + r = __rand(&td->__file_size_state); + sized = td->o.file_size_high - td->o.file_size_low; + ret = (unsigned long long) ((double) sized * (r / (FRAND_MAX + 1.0))); + } - r = os_random_long(&td->file_size_state); - sized = td->o.file_size_high - td->o.file_size_low; - ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0))); ret += td->o.file_size_low; ret -= (ret % td->o.rw_min_bs); return ret; @@ -231,7 +268,7 @@ static int file_size(struct thread_data *td, struct fio_file *f) static int bdev_size(struct thread_data *td, struct fio_file *f) { - unsigned long long bytes; + unsigned long long bytes = 0; int r; if (td->io_ops->open_file(td, f)) { @@ -240,7 +277,7 @@ static int bdev_size(struct thread_data *td, struct fio_file *f) return 1; } - r = blockdev_size(f->fd, &bytes); + r = blockdev_size(f, &bytes); if (r) { td_verror(td, r, "blockdev_size"); goto err; @@ -259,6 +296,41 @@ err: return 1; } +static int char_size(struct thread_data *td, struct fio_file *f) +{ +#ifdef FIO_HAVE_CHARDEV_SIZE + unsigned long long bytes = 0; + int r; + + if (td->io_ops->open_file(td, f)) { + log_err("fio: failed opening blockdev %s for size check\n", + f->file_name); + return 1; + } + + r = chardev_size(f, &bytes); + if (r) { + td_verror(td, r, "chardev_size"); + goto err; + } + + if (!bytes) { + log_err("%s: zero sized char device?\n", f->file_name); + goto err; + } + + f->real_file_size = bytes; + td->io_ops->close_file(td, f); + return 0; +err: + td->io_ops->close_file(td, f); + return 1; +#else + f->real_file_size = -1ULL; + return 0; +#endif +} + static int get_file_size(struct thread_data *td, struct fio_file *f) { int ret = 0; @@ -270,6 +342,8 @@ static int get_file_size(struct thread_data *td, struct fio_file *f) ret = file_size(td, f); else if (f->filetype == FIO_TYPE_BD) ret = bdev_size(td, f); + else if (f->filetype == FIO_TYPE_CHAR) + ret = char_size(td, f); else f->real_file_size = -1; @@ -277,7 +351,7 @@ static int get_file_size(struct thread_data *td, struct fio_file *f) return ret; if (f->file_offset > f->real_file_size) { - log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name, + log_err("%s: offset extends end (%llu > %llu)\n", td->o.name, f->file_offset, f->real_file_size); return 1; } @@ -307,14 +381,14 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f, * FIXME: add blockdev flushing too */ if (f->mmap_ptr) { - ret = madvise(f->mmap_ptr, f->mmap_sz, MADV_DONTNEED); + ret = posix_madvise(f->mmap_ptr, f->mmap_sz, POSIX_MADV_DONTNEED); #ifdef FIO_MADV_FREE - (void) madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE); + (void) posix_madvise(f->mmap_ptr, f->mmap_sz, FIO_MADV_FREE); #endif } else if (f->filetype == FIO_TYPE_FILE) { - ret = fadvise(f->fd, off, len, POSIX_FADV_DONTNEED); + ret = posix_fadvise(f->fd, off, len, POSIX_FADV_DONTNEED); } else if (f->filetype == FIO_TYPE_BD) { - ret = blockdev_invalidate_cache(f->fd); + ret = blockdev_invalidate_cache(f); if (ret < 0 && errno == EACCES && geteuid()) { if (!root_warn) { log_err("fio: only root may flush block " @@ -457,7 +531,7 @@ open_again: if (!from_hash && f->fd != -1) { if (add_file_hash(f)) { - int ret; + int fio_unused ret; /* * OK to ignore, we haven't done anything with it @@ -516,7 +590,7 @@ struct fio_mount { static unsigned long long get_fs_free_counts(struct thread_data *td) { struct flist_head *n, *tmp; - unsigned long long ret; + unsigned long long ret = 0; struct fio_mount *fm; FLIST_HEAD(list); struct fio_file *f; @@ -526,6 +600,13 @@ static unsigned long long get_fs_free_counts(struct thread_data *td) struct stat sb; char buf[256]; + if (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_CHAR) { + if (f->real_file_size != -1ULL) + ret += f->real_file_size; + continue; + } else if (f->filetype != FIO_TYPE_FILE) + continue; + strcpy(buf, f->file_name); if (stat(buf, &sb) < 0) { @@ -555,7 +636,6 @@ static unsigned long long get_fs_free_counts(struct thread_data *td) flist_add(&fm->list, &list); } - ret = 0; flist_for_each_safe(n, tmp, &list) { unsigned long long sz; @@ -679,6 +759,9 @@ int setup_files(struct thread_data *td) } } + if (td->o.size_percent) + total_size = (total_size * td->o.size_percent) / 100; + if (!td->o.size || td->o.size > total_size) td->o.size = total_size; @@ -689,7 +772,7 @@ int setup_files(struct thread_data *td) temp_stall_ts = 1; if (!terse_output) log_info("%s: Laying out IO file(s) (%u file(s) /" - " %LuMB)\n", td->o.name, need_extend, + " %lluMB)\n", td->o.name, need_extend, extend_size >> 20); for_each_file(td, f, i) { @@ -766,11 +849,15 @@ int init_random_map(struct thread_data *td) (unsigned long long) td->o.rw_min_bs; num_maps = (blocks + BLOCKS_PER_MAP - 1) / (unsigned long long) BLOCKS_PER_MAP; - f->file_map = smalloc(num_maps * sizeof(int)); - if (f->file_map) { - f->num_maps = num_maps; - continue; - } + if (num_maps == (unsigned long) num_maps) { + f->file_map = smalloc(num_maps * sizeof(unsigned long)); + if (f->file_map) { + f->num_maps = num_maps; + continue; + } + } else + f->file_map = NULL; + if (!td->o.softrandommap) { log_err("fio: failed allocating random map. If running" " a large number of jobs, try the 'norandommap'" @@ -839,6 +926,11 @@ static void get_file_type(struct fio_file *f) else f->filetype = FIO_TYPE_FILE; + /* \\.\ is the device namespace in Windows, where every file is + * a block device */ + if (strncmp(f->file_name, "\\\\.\\", 4) == 0) + f->filetype = FIO_TYPE_BD; + if (!stat(f->file_name, &sb)) { if (S_ISBLK(sb.st_mode)) f->filetype = FIO_TYPE_BD; @@ -865,6 +957,7 @@ int add_file(struct thread_data *td, const char *fname) } f->fd = -1; + fio_file_reset(f); if (td->files_size <= td->files_index) { int new_size = td->o.nr_files + 1; @@ -918,6 +1011,19 @@ int add_file(struct thread_data *td, const char *fname) return cur_files; } +int add_file_exclusive(struct thread_data *td, const char *fname) +{ + struct fio_file *f; + unsigned int i; + + for_each_file(td, f, i) { + if (!strcmp(f->file_name, fname)) + return i; + } + + return add_file(td, fname); +} + void get_file(struct fio_file *f) { dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references); @@ -1035,7 +1141,7 @@ static int recurse_dir(struct thread_data *td, const char *dirname) if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) continue; - sprintf(full_path, "%s/%s", dirname, dir->d_name); + sprintf(full_path, "%s%s%s", dirname, FIO_OS_PATH_SEPARATOR, dir->d_name); if (lstat(full_path, &sb) == -1) { if (errno != ENOENT) { @@ -1092,6 +1198,7 @@ void dup_files(struct thread_data *td, struct thread_data *org) assert(0); } __f->fd = -1; + fio_file_reset(__f); if (f->file_name) { __f->file_name = smalloc_strdup(f->file_name);