X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=84cd7f7dfe2bffa93ed62d3ea7aaa790cd6e02b3;hp=52d822ac4b6c8fb1bff042fd56aae96e0846c9da;hb=e916b390684ec1ca6247f98138fa9c1682701d29;hpb=c21ac0fff997a382929d1a53cf32d841fc35549f;ds=sidebyside diff --git a/filesetup.c b/filesetup.c index 52d822ac..84cd7f7d 100644 --- a/filesetup.c +++ b/filesetup.c @@ -15,7 +15,7 @@ static int file_ok(struct thread_data *td, struct fio_file *f) { struct stat st; - if (td->filetype != FIO_TYPE_FILE) + if (td->filetype != FIO_TYPE_FILE || (td->io_ops->flags & FIO_NULLIO)) return 0; if (stat(f->file_name, &st) == -1) @@ -44,12 +44,17 @@ static int create_file(struct thread_data *td, struct fio_file *f) goto err; } - b = malloc(td->max_bs); - memset(b, 0, td->max_bs); + if (posix_fallocate(f->fd, 0, f->file_size) < 0) { + td_verror(td, errno); + goto err; + } + + b = malloc(td->max_bs[DDIR_WRITE]); + memset(b, 0, td->max_bs[DDIR_WRITE]); left = f->file_size; while (left && !td->terminate) { - bs = td->max_bs; + bs = td->max_bs[DDIR_WRITE]; if (bs > left) bs = left; @@ -88,20 +93,29 @@ static int create_files(struct thread_data *td) struct fio_file *f; int i, err, need_create; + for_each_file(td, f, i) + f->file_size = td->total_file_size / td->nr_files; + /* * unless specifically asked for overwrite, let normal io extend it */ - if (!td->overwrite) { - for_each_file(td, f, i) - f->file_size = td->total_file_size / td->nr_files; - + if (!td->overwrite) return 0; - } need_create = 0; - if (td->filetype == FIO_TYPE_FILE) - for_each_file(td, f, i) - need_create += file_ok(td, f); + if (td->filetype == FIO_TYPE_FILE) { + for_each_file(td, f, i) { + int file_there = !file_ok(td, f); + + if (file_there && td->ddir == DDIR_WRITE && + !td->overwrite) { + unlink(f->file_name); + file_there = 0; + } + + need_create += !file_there; + } + } if (!need_create) return 0; @@ -113,14 +127,19 @@ static int create_files(struct thread_data *td) } temp_stall_ts = 1; - fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n", + fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n", td->name, td->nr_uniq_files, (td->total_file_size >> 20) / td->nr_uniq_files, td->total_file_size >> 20); err = 0; for_each_file(td, f, i) { + /* + * Only unlink files that we created. + */ + f->unlink = 0; if (file_ok(td, f)) { + f->unlink = td->unlink; err = create_file(td, f); if (err) break; @@ -135,6 +154,16 @@ static int file_size(struct thread_data *td, struct fio_file *f) { struct stat st; + /* + * if we are not doing real io, just pretend the file is as large + * as the size= given. this works fine with nrfiles > 1 as well, + * we only really care about it being at least as big as size= + */ + if (td->io_ops->flags & FIO_NULLIO) { + f->real_file_size = f->file_size = td->total_file_size; + return 0; + } + if (td->overwrite) { if (fstat(f->fd, &st) == -1) { td_verror(td, errno); @@ -145,9 +174,9 @@ static int file_size(struct thread_data *td, struct fio_file *f) if (!f->file_size || f->file_size > f->real_file_size) f->file_size = f->real_file_size; - } + } else + f->real_file_size = f->file_size; - f->file_size -= f->file_offset; return 0; } @@ -311,29 +340,40 @@ static int setup_file(struct thread_data *td, struct fio_file *f) { int flags = 0; - if (td->odirect) - flags |= OS_O_DIRECT; - - if (td_write(td) || td_rw(td)) { - if (td->filetype == FIO_TYPE_FILE) { - if (!td->overwrite) - flags |= O_TRUNC; + if (td->io_ops->flags & FIO_NETIO) + return 0; - flags |= O_CREAT; - } + /* + * we need a valid file descriptor, but don't create a real file. + * lets just dup stdout, seems like a sensible approach. + */ + if (td->io_ops->flags & FIO_NULLIO) + f->fd = dup(STDOUT_FILENO); + else { + if (td->odirect) + flags |= OS_O_DIRECT; if (td->sync_io) flags |= O_SYNC; - flags |= O_RDWR; - - f->fd = open(f->file_name, flags, 0600); - } else { - if (td->filetype == FIO_TYPE_CHAR) + if (td_write(td) || td_rw(td)) { flags |= O_RDWR; - else - flags |= O_RDONLY; - f->fd = open(f->file_name, flags); + if (td->filetype == FIO_TYPE_FILE) { + if (!td->overwrite) + flags |= O_TRUNC; + + flags |= O_CREAT; + } + + f->fd = open(f->file_name, flags, 0600); + } else { + if (td->filetype == FIO_TYPE_CHAR) + flags |= O_RDWR; + else + flags |= O_RDONLY; + + f->fd = open(f->file_name, flags); + } } if (f->fd == -1) { @@ -347,10 +387,34 @@ static int setup_file(struct thread_data *td, struct fio_file *f) return 0; } +int open_files(struct thread_data *td) +{ + struct fio_file *f; + int i, err = 0; + + for_each_file(td, f, i) { + err = setup_file(td, f); + if (err) + break; + } + + if (!err) + return 0; + + for_each_file(td, f, i) { + if (f->fd != -1) { + close(f->fd); + f->fd = -1; + } + } + + return err; +} + int setup_files(struct thread_data *td) { struct fio_file *f; - int i, err; + int err, i; /* * if ioengine defines a setup() method, it's responsible for @@ -362,13 +426,7 @@ int setup_files(struct thread_data *td) if (create_files(td)) return 1; - err = 0; - for_each_file(td, f, i) { - err = setup_file(td, f); - if (err) - break; - } - + err = open_files(td); if (err) return err; @@ -392,9 +450,18 @@ int setup_files(struct thread_data *td) td->total_io_size = td->io_size * td->loops; if (td->io_ops->flags & FIO_MMAPIO) - return setup_files_mmap(td); + err = setup_files_mmap(td); else - return setup_files_plain(td); + err = setup_files_plain(td); + + for_each_file(td, f, i) { + if (f->fd != -1) { + close(f->fd); + f->fd = -1; + } + } + + return err; } void close_files(struct thread_data *td) @@ -403,14 +470,13 @@ void close_files(struct thread_data *td) int i; for_each_file(td, f, i) { - if (f->fd != -1) { - if (td->unlink && td->filetype == FIO_TYPE_FILE && - td->filename) { - unlink(f->file_name); - td->filename = NULL; - } + if (!td->filename && f->unlink && + td->filetype == FIO_TYPE_FILE) { + unlink(f->file_name); free(f->file_name); f->file_name = NULL; + } + if (f->fd != -1) { close(f->fd); f->fd = -1; } @@ -420,6 +486,7 @@ void close_files(struct thread_data *td) } } + td->filename = NULL; free(td->files); td->files = NULL; td->nr_files = 0;