X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=5134fdbb8af5a52e08e5ad8b60ea820e0caeab9f;hp=faeefaf308fa3e32107375fed6ac68faf65fe594;hb=1f809d151ddc4a4c348c2e4f6007db510e3e08a2;hpb=660a1cb5fb9843ec09a04337714e78d63cd557e7 diff --git a/filesetup.c b/filesetup.c index faeefaf3..5134fdbb 100644 --- a/filesetup.c +++ b/filesetup.c @@ -9,6 +9,8 @@ #include "fio.h" +static int root_warn; + static int extend_file(struct thread_data *td, struct fio_file *f) { int r, new_layout = 0, unlink_file = 0, flags; @@ -16,6 +18,11 @@ static int extend_file(struct thread_data *td, struct fio_file *f) unsigned int bs; char *b; + if (read_only) { + log_err("fio: refusing extend of file due to read-only\n"); + return 0; + } + /* * check if we need to lay the file out complete again. fio * does that for operations involving reads, or for writes @@ -102,7 +109,7 @@ static unsigned long long get_rand_file_size(struct thread_data *td) long r; r = os_random_long(&td->file_size_state); - ret = td->o.file_size_low + (unsigned long long) ((double) td->o.file_size_high * (r / (RAND_MAX + 1.0))); + ret = td->o.file_size_low + (unsigned long long) ((double) (td->o.file_size_high - td->o.file_size_low) * (r / (RAND_MAX + 1.0))); ret -= (ret % td->o.rw_min_bs); return ret; } @@ -178,7 +185,10 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f) else if (f->filetype == FIO_TYPE_BD) { ret = blockdev_invalidate_cache(f->fd); if (ret < 0 && errno == EACCES && geteuid()) { - log_err("fio: only root may flush block devices. Cache flush bypassed!\n"); + if (!root_warn) { + log_err("fio: only root may flush block devices. Cache flush bypassed!\n"); + root_warn = 1; + } ret = 0; } } else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE) @@ -221,8 +231,12 @@ int generic_open_file(struct thread_data *td, struct fio_file *f) flags |= OS_O_DIRECT; if (td->o.sync_io) flags |= O_SYNC; + if (f->filetype != FIO_TYPE_FILE) + flags |= O_NOATIME; if (td_write(td)) { + assert(!read_only); + flags |= O_RDWR; if (f->filetype == FIO_TYPE_FILE) @@ -233,7 +247,7 @@ int generic_open_file(struct thread_data *td, struct fio_file *f) else f->fd = open(f->file_name, flags, 0600); } else { - if (f->filetype == FIO_TYPE_CHAR) + if (f->filetype == FIO_TYPE_CHAR && !read_only) flags |= O_RDWR; else flags |= O_RDONLY; @@ -359,7 +373,8 @@ int setup_files(struct thread_data *td) /* * device/file sizes are zero and no size given, punt */ - if ((!total_size || total_size == -1ULL) && !td->o.size) { + if ((!total_size || total_size == -1ULL) && !td->o.size && + !(td->io_ops->flags & FIO_NOIO)) { log_err("%s: you need to specify size=\n", td->o.name); td_verror(td, EINVAL, "total_file_size"); return 1; @@ -373,6 +388,8 @@ int setup_files(struct thread_data *td) extend_size = total_size = 0; need_extend = 0; for_each_file(td, f, i) { + f->file_offset = td->o.start_offset; + if (!td->o.file_size_low) { /* * no file size range given, file size is equal to @@ -380,20 +397,27 @@ int setup_files(struct thread_data *td) * zero, set it to the real file size. */ f->io_size = td->o.size / td->o.nr_files; - if (!f->io_size) - f->io_size = f->real_file_size; + if (!f->io_size) { + if (f->file_offset > f->real_file_size) + goto err_offset; + f->io_size = f->real_file_size - f->file_offset; + } } else if (f->real_file_size < td->o.file_size_low || f->real_file_size > td->o.file_size_high) { + if (f->file_offset > td->o.file_size_low) + goto err_offset; /* * file size given. if it's fixed, use that. if it's a * range, generate a random size in-between. */ if (td->o.file_size_low == td->o.file_size_high) - f->io_size = td->o.file_size_low; + f->io_size = td->o.file_size_low - f->file_offset; else - f->io_size = get_rand_file_size(td); - } else - f->io_size = f->real_file_size; + f->io_size = get_rand_file_size(td) - f->file_offset; + } else if (f->file_offset > f->real_file_size) + goto err_offset; + else + f->io_size = f->real_file_size - f->file_offset; if (f->io_size == -1ULL) total_size = -1ULL; @@ -401,15 +425,15 @@ int setup_files(struct thread_data *td) total_size += f->io_size; if (f->filetype == FIO_TYPE_FILE && - f->io_size > f->real_file_size && + (f->io_size + f->file_offset) > f->real_file_size && !(td->io_ops->flags & FIO_DISKLESSIO)) { need_extend++; - extend_size += f->io_size; + extend_size += (f->io_size + f->file_offset); f->flags |= FIO_FILE_EXTEND; - } + } } - if (!td->o.size) + if (!td->o.size || td->o.size > total_size) td->o.size = total_size; /* @@ -417,7 +441,7 @@ int setup_files(struct thread_data *td) */ if (need_extend) { temp_stall_ts = 1; - log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n", + log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n", td->o.name, need_extend, extend_size >> 20); for_each_file(td, f, i) { @@ -426,7 +450,7 @@ int setup_files(struct thread_data *td) assert(f->filetype == FIO_TYPE_FILE); f->flags &= ~FIO_FILE_EXTEND; - f->real_file_size = f->io_size; + f->real_file_size = (f->io_size + f->file_offset); err = extend_file(td, f); if (err) break; @@ -440,8 +464,16 @@ int setup_files(struct thread_data *td) if (!td->o.zone_size) td->o.zone_size = td->o.size; - td->total_io_size = td->o.size * td->o.loops; + /* + * iolog already set the total io size, if we read back + * stored entries. + */ + if (!td->o.read_iolog_file) + td->total_io_size = td->o.size * td->o.loops; return 0; +err_offset: + log_err("%s: you need to specify valid offset=\n", td->o.name); + return 1; } int init_random_map(struct thread_data *td) @@ -474,8 +506,7 @@ void close_files(struct thread_data *td) unsigned int i; for_each_file(td, f, i) { - if ((f->flags & FIO_FILE_UNLINK) && - f->filetype == FIO_TYPE_FILE) + if (td->o.unlink && f->filetype == FIO_TYPE_FILE) unlink(f->file_name); td_io_close_file(td, f); @@ -514,7 +545,7 @@ static void get_file_type(struct fio_file *f) } } -void add_file(struct thread_data *td, const char *fname) +int add_file(struct thread_data *td, const char *fname) { int cur_files = td->files_index; char file_name[PATH_MAX]; @@ -544,10 +575,13 @@ void add_file(struct thread_data *td, const char *fname) td->files_index++; if (f->filetype == FIO_TYPE_FILE) td->nr_normal_files++; + + return cur_files; } void get_file(struct fio_file *f) { + assert(f->flags & FIO_FILE_OPEN); f->references++; } @@ -645,3 +679,28 @@ void dup_files(struct thread_data *td, struct thread_data *org) f->file_name = strdup(f->file_name); } } + +/* + * Returns the index that matches the filename, or -1 if not there + */ +int get_fileno(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 -1; +} + +/* + * For log usage, where we add/open/close files automatically + */ +void free_release_files(struct thread_data *td) +{ + close_files(td); + td->files_index = 0; + td->nr_normal_files = 0; +}