X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=bd975d82470ce4dc7bedb82a5f1cbd151e5574c1;hp=f64c7a119d66cbf43173e894873b357e33dae768;hb=cbf5c1d7a2286fa1cf548c0678b3b0bf13bcda7e;hpb=7bb48f84ac78cac1f90e3e04d0220d90d6a64a6b diff --git a/filesetup.c b/filesetup.c index f64c7a11..bd975d82 100644 --- a/filesetup.c +++ b/filesetup.c @@ -8,23 +8,36 @@ #include #include "fio.h" -#include "os.h" 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; - int r; - if (f->flags & FIO_FILE_EXISTS) { + /* + * check if we need to lay the file out complete again. fio + * does that for operations involving reads, or for writes + * where overwrite is set + */ + if (td_read(td) || (td_write(td) && td->o.overwrite)) + new_layout = 1; + if (td_write(td) && !td->o.overwrite) + unlink_file = 1; + + if ((unlink_file || new_layout) && (f->flags & FIO_FILE_EXISTS)) { if (unlink(f->file_name) < 0) { td_verror(td, errno, "unlink"); return 1; } } - f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644); + flags = O_WRONLY | O_CREAT; + if (new_layout) + flags |= O_TRUNC; + + f->fd = open(f->file_name, flags, 0644); if (f->fd < 0) { td_verror(td, errno, "open"); return 1; @@ -35,6 +48,9 @@ static int extend_file(struct thread_data *td, struct fio_file *f) goto err; } + if (!new_layout) + goto done; + if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) { td_verror(td, errno, "posix_fallocate"); goto err; @@ -70,6 +86,7 @@ static int extend_file(struct thread_data *td, struct fio_file *f) fsync(f->fd); free(b); +done: close(f->fd); f->fd = -1; return 0; @@ -122,6 +139,9 @@ static int get_file_size(struct thread_data *td, struct fio_file *f) { int ret = 0; + if (f->flags & FIO_SIZE_KNOWN) + return 0; + if (f->filetype == FIO_TYPE_FILE) ret = file_size(td, f); else if (f->filetype == FIO_TYPE_BD) @@ -137,6 +157,7 @@ static int get_file_size(struct thread_data *td, struct fio_file *f) return 1; } + f->flags |= FIO_SIZE_KNOWN; return 0; } @@ -214,21 +235,6 @@ int generic_open_file(struct thread_data *td, struct fio_file *f) if (get_file_size(td, f)) goto err; - if (td->o.invalidate_cache && file_invalidate_cache(td, f)) - goto err; - - if (td->o.fadvise_hint) { - if (td_random(td)) - flags = POSIX_FADV_RANDOM; - else - flags = POSIX_FADV_SEQUENTIAL; - - if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) { - td_verror(td, errno, "fadvise"); - goto err; - } - } - return 0; err: close(f->fd); @@ -243,8 +249,15 @@ int open_files(struct thread_data *td) for_each_file(td, f, i) { err = td_io_open_file(td, f); - if (err) + if (err) { + if (td->error == EMFILE) { + log_err("fio: limited open files to: %d\n", td->nr_open_files); + td->o.open_files = td->nr_open_files; + err = 0; + clear_error(td); + } break; + } if (td->o.open_files == td->nr_open_files) break; @@ -269,15 +282,19 @@ static int get_file_sizes(struct thread_data *td) int err = 0; for_each_file(td, f, i) { - err = td->io_ops->open_file(td, f); - if (err) { - td->error = 0; - memset(td->verror, 0, sizeof(td->verror)); - err = 0; - continue; + if (td->io_ops->open_file(td, f)) { + if (td->error != ENOENT) { + log_err("%s\n", td->verror); + err = 1; + } + clear_error(td); + } else { + if (td->io_ops->close_file) + td->io_ops->close_file(td, f); } - td->io_ops->close_file(td, f); + if (f->real_file_size == -1ULL && td->o.size) + f->real_file_size = td->o.size / td->o.nr_files; } return err; @@ -291,7 +308,7 @@ int setup_files(struct thread_data *td) unsigned long long total_size, extend_size; struct fio_file *f; unsigned int i; - int err, need_extend; + int err = 0, need_extend; /* * if ioengine defines a setup() method, it's responsible for @@ -321,7 +338,7 @@ int setup_files(struct thread_data *td) /* * device/file sizes are zero and no size given, punt */ - if (!total_size && !td->o.size) { + if ((!total_size || total_size == -1ULL) && !td->o.size) { log_err("%s: you need to specify size=\n", td->o.name); td_verror(td, EINVAL, "total_file_size"); return 1; @@ -386,6 +403,7 @@ int setup_files(struct thread_data *td) if (!(f->flags & FIO_FILE_EXTEND)) continue; + assert(f->filetype == FIO_TYPE_FILE); f->flags &= ~FIO_FILE_EXTEND; f->real_file_size = f->io_size; err = extend_file(td, f); @@ -483,6 +501,12 @@ void add_file(struct thread_data *td, const char *fname) memset(f, 0, sizeof(*f)); f->fd = -1; + /* + * init function, io engine may not be loaded yet + */ + if (td->io_ops && (td->io_ops->flags & FIO_DISKLESSIO)) + f->real_file_size = -1ULL; + if (td->o.directory) len = sprintf(file_name, "%s/", td->o.directory); @@ -515,6 +539,7 @@ void put_file(struct thread_data *td, struct fio_file *f) if (td->io_ops->close_file) td->io_ops->close_file(td, f); + td->nr_open_files--; f->flags &= ~FIO_FILE_OPEN; } @@ -527,7 +552,10 @@ static int recurse_dir(struct thread_data *td, const char *dirname) D = opendir(dirname); if (!D) { - td_verror(td, errno, "opendir"); + char buf[FIO_VERROR_SIZE]; + + snprintf(buf, FIO_VERROR_SIZE - 1, "opendir(%s)", dirname); + td_verror(td, errno, buf); return 1; } @@ -552,6 +580,8 @@ static int recurse_dir(struct thread_data *td, const char *dirname) td->o.nr_files++; continue; } + if (!S_ISDIR(sb.st_mode)) + continue; if ((ret = recurse_dir(td, full_path)) != 0) break; @@ -563,7 +593,12 @@ static int recurse_dir(struct thread_data *td, const char *dirname) int add_dir_files(struct thread_data *td, const char *path) { - return recurse_dir(td, path); + int ret = recurse_dir(td, path); + + if (!ret) + log_info("fio: opendir added %d files\n", td->o.nr_files); + + return ret; } void dup_files(struct thread_data *td, struct thread_data *org)