Revamp the file creation code
This was long overdue, it's much simpler now and hopefully
less bug prone. Probably a few stray bugs here and there
that needs straightening out, but the end result should
be a lot better.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/engines/cpu.c b/engines/cpu.c
index c908cab..9fac418 100644
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -19,14 +19,8 @@
struct fio_file *f;
unsigned int i;
- td->o.size = -1;
- td->io_size = td->o.size;
- td->total_io_size = td->io_size;
-
- for_each_file(td, f, i) {
- f->real_file_size = -1;
- f->file_size = -1;
- }
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
return 0;
}
diff --git a/engines/mmap.c b/engines/mmap.c
index 556e56d..da69069 100644
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -25,7 +25,7 @@
else if (io_u->ddir == DDIR_WRITE)
memcpy(f->mmap + real_off, io_u->xfer_buf, io_u->xfer_buflen);
else if (io_u->ddir == DDIR_SYNC) {
- size_t len = (f->file_size + page_size - 1) & ~page_mask;
+ size_t len = (f->io_size + page_size - 1) & ~page_mask;
if (msync(f->mmap, len, MS_SYNC)) {
io_u->error = errno;
@@ -71,7 +71,7 @@
} else
flags = PROT_READ;
- f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
+ f->mmap = mmap(NULL, f->io_size, flags, MAP_SHARED, f->fd, f->file_offset);
if (f->mmap == MAP_FAILED) {
f->mmap = NULL;
td_verror(td, errno, "mmap");
@@ -82,12 +82,12 @@
goto err;
if (!td_random(td)) {
- if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
+ if (madvise(f->mmap, f->io_size, MADV_SEQUENTIAL) < 0) {
td_verror(td, errno, "madvise");
goto err;
}
} else {
- if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
+ if (madvise(f->mmap, f->io_size, MADV_RANDOM) < 0) {
td_verror(td, errno, "madvise");
goto err;
}
@@ -104,7 +104,7 @@
struct fio_file *f)
{
if (f->mmap) {
- munmap(f->mmap, f->file_size);
+ munmap(f->mmap, f->io_size);
f->mmap = NULL;
}
generic_close_file(td, f);
diff --git a/engines/net.c b/engines/net.c
index 2bbbb0e..66f1e60 100644
--- a/engines/net.c
+++ b/engines/net.c
@@ -61,7 +61,7 @@
* if we are going to write more, set MSG_MORE
*/
if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
- td->io_size)
+ td->o.size)
flags = MSG_MORE;
ret = send(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
@@ -224,17 +224,10 @@
{
struct netio_data *nd = td->io_ops->data;
unsigned short port;
- struct fio_file *f;
char host[64], buf[128];
- unsigned int i;
char *sep;
int ret;
- if (!td->o.size) {
- log_err("fio: need size= set\n");
- return 1;
- }
-
if (td_rw(td)) {
log_err("fio: network connections must be read OR write\n");
return 1;
@@ -261,18 +254,7 @@
ret = fio_netio_setup_connect(td, host, port);
}
- if (ret)
- return ret;
-
- td->io_size = td->o.size;
- td->total_io_size = td->io_size;
-
- for_each_file(td, f, i) {
- f->file_size = td->o.size / td->o.nr_files;
- f->real_file_size = f->file_size;
- }
-
- return 0;
+ return ret;
}
static void fio_netio_cleanup(struct thread_data *td)
@@ -287,11 +269,21 @@
static int fio_netio_setup(struct thread_data *td)
{
- struct netio_data *nd = malloc(sizeof(*nd));
+ struct netio_data *nd;
+ struct fio_file *f;
+ unsigned int i;
- memset(nd, 0, sizeof(*nd));
- nd->listenfd = -1;
- td->io_ops->data = nd;
+ if (!td->io_ops->data) {
+ nd = malloc(sizeof(*nd));;
+
+ memset(nd, 0, sizeof(*nd));
+ nd->listenfd = -1;
+ td->io_ops->data = nd;
+
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
+ }
+
return 0;
}
diff --git a/engines/null.c b/engines/null.c
index 86b9cbd..724feca 100644
--- a/engines/null.c
+++ b/engines/null.c
@@ -71,18 +71,8 @@
struct fio_file *f;
unsigned int i;
- if (!td->o.size) {
- log_err("fio: need size= set\n");
- return 1;
- }
-
- td->io_size = td->o.size;
- td->total_io_size = td->io_size;
-
- for_each_file(td, f, i) {
- f->real_file_size = td->total_io_size / td->o.nr_files;
- f->file_size = f->real_file_size;
- }
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
return 0;
}
diff --git a/filesetup.c b/filesetup.c
index 7fbd347..f64c7a1 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -10,50 +10,32 @@
#include "fio.h"
#include "os.h"
-/*
- * Check if the file exists and it's large enough.
- */
-static int file_ok(struct thread_data *td, struct fio_file *f)
-{
- struct stat st;
-
- if (f->filetype != FIO_TYPE_FILE ||
- (td->io_ops->flags & FIO_DISKLESSIO))
- return 0;
-
- if (lstat(f->file_name, &st) == -1)
- return 1;
-
- /*
- * if it's a special file, size is always ok for now
- */
- if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))
- return 0;
- if (st.st_size < (off_t) f->file_size)
- return 1;
-
- return 0;
-}
-
-static int create_file(struct thread_data *td, struct fio_file *f)
+static int extend_file(struct thread_data *td, struct fio_file *f)
{
unsigned long long left;
unsigned int bs;
char *b;
int r;
+ if (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);
if (f->fd < 0) {
td_verror(td, errno, "open");
return 1;
}
- if (ftruncate(f->fd, f->file_size) == -1) {
+ if (ftruncate(f->fd, f->real_file_size) == -1) {
td_verror(td, errno, "ftruncate");
goto err;
}
- if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
+ if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
td_verror(td, errno, "posix_fallocate");
goto err;
}
@@ -61,7 +43,7 @@
b = malloc(td->o.max_bs[DDIR_WRITE]);
memset(b, 0, td->o.max_bs[DDIR_WRITE]);
- left = f->file_size;
+ left = f->real_file_size;
while (left && !td->terminate) {
bs = td->o.max_bs[DDIR_WRITE];
if (bs > left)
@@ -97,190 +79,27 @@
return 1;
}
-static unsigned long long set_rand_file_size(struct thread_data *td,
- unsigned long long total_size)
+static unsigned long long get_rand_file_size(struct thread_data *td)
{
- unsigned long long upper = total_size;
unsigned long long ret;
long r;
- if (upper > td->o.file_size_high)
- upper = td->o.file_size_high;
- else if (upper < td->o.file_size_low)
- return 0;
- else if (!upper)
- return 0;
-
r = os_random_long(&td->file_size_state);
- ret = td->o.file_size_low + (unsigned long long) ((double) upper * (r / (RAND_MAX + 1.0)));
+ ret = td->o.file_size_low + (unsigned long long) ((double) td->o.file_size_high * (r / (RAND_MAX + 1.0)));
ret -= (ret % td->o.rw_min_bs);
- if (ret > upper)
- ret = upper;
return ret;
}
-static int fill_file_size(struct thread_data *td, struct fio_file *f,
- unsigned long long *file_size, int new_files)
-{
- if (!td->o.file_size_low) {
- f->file_size = *file_size / new_files;
- f->real_file_size = f->file_size;
- } else {
- /*
- * If we don't have enough space left for a file
- * of the minimum size, bail.
- */
- if (*file_size < td->o.file_size_low)
- return 1;
-
- f->file_size = set_rand_file_size(td, *file_size);
- f->real_file_size = f->file_size;
- *file_size -= f->file_size;
- }
-
- return 0;
-}
-
-static int create_files(struct thread_data *td)
-{
- struct fio_file *f;
- int err, need_create, can_extend;
- unsigned long long total_file_size, local_file_size, create_size;
- unsigned int i, new_files;
-
- new_files = 0;
- total_file_size = td->o.size;
- for_each_file(td, f, i) {
- unsigned long long s;
-
- f->file_offset = td->o.start_offset;
-
- if (!total_file_size)
- continue;
-
- if (f->filetype != FIO_TYPE_FILE) {
- if (!f->file_size)
- f->file_size = total_file_size / td->o.nr_files;
- continue;
- }
-
- if (f->flags & FIO_FILE_EXISTS) {
- if ((f->file_size > td->o.size / td->o.nr_files) ||
- !f->file_size)
- f->file_size = td->o.size / td->o.nr_files;
-
- s = f->file_size;
- if (s > total_file_size)
- s = total_file_size;
-
- total_file_size -= s;
- } else
- new_files++;
- }
-
- /*
- * unless specifically asked for overwrite, let normal io extend it
- */
- can_extend = !td->o.overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
- if (can_extend && new_files) {
- for_each_file(td, f, i) {
- if (fill_file_size(td, f, &total_file_size, new_files)) {
- log_info("fio: limited to %d files\n", i);
- td->o.nr_files = i;
- break;
- }
- }
-
- return 0;
- }
-
- local_file_size = total_file_size;
- if (!local_file_size)
- local_file_size = -1;
-
- total_file_size = 0;
- need_create = 0;
- create_size = 0;
- for_each_file(td, f, i) {
- int file_there;
-
- if (f->filetype != FIO_TYPE_FILE)
- continue;
- if (f->flags & FIO_FILE_EXISTS) {
- total_file_size += f->file_size;
- continue;
- }
-
- if (fill_file_size(td, f, &local_file_size, new_files)) {
- log_info("fio: limited to %d files\n", i);
- new_files -= (td->o.nr_files - i);
- td->o.nr_files = i;
- break;
- }
-
- total_file_size += f->file_size;
- create_size += f->file_size;
- file_there = !file_ok(td, f);
-
- if (file_there && td_write(td) && !td->o.overwrite) {
- unlink(f->file_name);
- file_there = 0;
- }
-
- need_create += !file_there;
- }
-
- if (!need_create)
- return 0;
-
- if (!td->o.size && !total_file_size) {
- log_err("Need size for create\n");
- td_verror(td, EINVAL, "file_size");
- return 1;
- }
-
- temp_stall_ts = 1;
- log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
- td->o.name, new_files, create_size >> 20);
-
- err = 0;
- for_each_file(td, f, i) {
- /*
- * Only unlink files that we created.
- */
- f->flags &= ~FIO_FILE_UNLINK;
- if (file_ok(td, f)) {
- if (td->o.unlink)
- f->flags |= FIO_FILE_UNLINK;
-
- f->flags |= FIO_FILE_NOSORT;
- err = create_file(td, f);
- if (err)
- break;
- }
- }
-
- temp_stall_ts = 0;
- return err;
-}
-
static int file_size(struct thread_data *td, struct fio_file *f)
{
struct stat st;
- if (td->o.overwrite) {
- if (fstat(f->fd, &st) == -1) {
- td_verror(td, errno, "fstat");
- return 1;
- }
+ if (fstat(f->fd, &st) == -1) {
+ td_verror(td, errno, "fstat");
+ return 1;
+ }
- f->real_file_size = st.st_size;
-
- 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->real_file_size = st.st_size;
return 0;
}
@@ -296,14 +115,6 @@
}
f->real_file_size = bytes;
-
- /*
- * no extend possibilities, so limit size to device size if too large
- */
- if (!f->file_size || f->file_size > f->real_file_size)
- f->file_size = f->real_file_size;
-
- f->file_size -= f->file_offset;
return 0;
}
@@ -311,10 +122,9 @@
{
int ret = 0;
- if (f->filetype == FIO_TYPE_FILE) {
- if (!(f->flags & FIO_FILE_EXISTS))
- ret = file_size(td, f);
- } else if (f->filetype == FIO_TYPE_BD)
+ if (f->filetype == FIO_TYPE_FILE)
+ ret = file_size(td, f);
+ else if (f->filetype == FIO_TYPE_BD)
ret = bdev_size(td, f);
else
f->real_file_size = -1;
@@ -341,9 +151,9 @@
* FIXME: add blockdev flushing too
*/
if (f->mmap)
- ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
+ ret = madvise(f->mmap, f->io_size, MADV_DONTNEED);
else if (f->filetype == FIO_TYPE_FILE)
- ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+ ret = fadvise(f->fd, f->file_offset, f->io_size, POSIX_FADV_DONTNEED);
else if (f->filetype == FIO_TYPE_BD) {
ret = blockdev_invalidate_cache(f->fd);
if (ret < 0 && errno == EACCES && geteuid()) {
@@ -399,11 +209,6 @@
snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
td_verror(td, __e, buf);
- if (__e == EINVAL && td->o.odirect)
- log_err("fio: destination does not support O_DIRECT\n");
- if (__e == EMFILE)
- log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
- return 1;
}
if (get_file_size(td, f))
@@ -418,7 +223,7 @@
else
flags = POSIX_FADV_SEQUENTIAL;
- if (fadvise(f->fd, f->file_offset, f->file_size, flags) < 0) {
+ if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
td_verror(td, errno, "fadvise");
goto err;
}
@@ -454,49 +259,150 @@
return err;
}
-int setup_files(struct thread_data *td)
+/*
+ * open/close all files, so that ->real_file_size gets set
+ */
+static int get_file_sizes(struct thread_data *td)
{
struct fio_file *f;
unsigned int i;
- int err;
+ 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;
+ }
+
+ td->io_ops->close_file(td, f);
+ }
+
+ return err;
+}
+
+/*
+ * Open the files and setup files sizes, creating files if necessary.
+ */
+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;
/*
* if ioengine defines a setup() method, it's responsible for
- * setting up everything in the td->files[] area.
+ * opening the files and setting f->real_file_size to indicate
+ * the valid range for that file.
*/
if (td->io_ops->setup)
- return td->io_ops->setup(td);
+ err = td->io_ops->setup(td);
+ else
+ err = get_file_sizes(td);
- if (create_files(td))
- return 1;
-
- err = open_files(td);
if (err)
return err;
/*
- * Recalculate the total file size now that files are set up.
+ * check sizes. if the files/devices do not exist and the size
+ * isn't passed to fio, abort.
*/
- td->o.size = 0;
- for_each_file(td, f, i)
- td->o.size += f->file_size;
+ total_size = 0;
+ for_each_file(td, f, i) {
+ if (f->real_file_size == -1ULL)
+ total_size = -1ULL;
+ else
+ total_size += f->real_file_size;
+ }
- td->io_size = td->o.size;
- if (td->io_size == 0) {
- log_err("%s: no io blocks\n", td->o.name);
+ /*
+ * device/file sizes are zero and no size given, punt
+ */
+ if (!total_size && !td->o.size) {
+ log_err("%s: you need to specify size=\n", td->o.name);
td_verror(td, EINVAL, "total_file_size");
return 1;
}
+ /*
+ * now file sizes are known, so we can set ->io_size. if size= is
+ * not given, ->io_size is just equal to ->real_file_size. if size
+ * is given, ->io_size is size / nr_files.
+ */
+ extend_size = total_size = 0;
+ need_extend = 0;
+ for_each_file(td, f, i) {
+ if (!td->o.file_size_low) {
+ /*
+ * no file size range given, file size is equal to
+ * total size divided by number of files. if that is
+ * 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;
+ } else if (f->real_file_size < td->o.file_size_low ||
+ f->real_file_size > td->o.file_size_high) {
+ /*
+ * 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;
+ else
+ f->io_size = get_rand_file_size(td);
+ } else
+ f->io_size = f->real_file_size;
+
+ if (f->io_size == -1ULL)
+ total_size = -1ULL;
+ else
+ total_size += f->io_size;
+
+ if (f->filetype == FIO_TYPE_FILE &&
+ f->io_size > f->real_file_size &&
+ !(td->io_ops->flags & FIO_DISKLESSIO)) {
+ need_extend++;
+ extend_size += f->io_size;
+ f->flags |= FIO_FILE_EXTEND;
+ }
+ }
+
+ if (!td->o.size)
+ td->o.size = total_size;
+
+ /*
+ * See if we need to extend some files
+ */
+ if (need_extend) {
+ temp_stall_ts = 1;
+ log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+ td->o.name, need_extend, extend_size >> 20);
+
+ for_each_file(td, f, i) {
+ if (!(f->flags & FIO_FILE_EXTEND))
+ continue;
+
+ f->flags &= ~FIO_FILE_EXTEND;
+ f->real_file_size = f->io_size;
+ err = extend_file(td, f);
+ if (err)
+ break;
+ }
+ temp_stall_ts = 0;
+ }
+
+ if (err)
+ return err;
+
if (!td->o.zone_size)
- td->o.zone_size = td->io_size;
+ td->o.zone_size = td->o.size;
- td->total_io_size = td->io_size * td->o.loops;
-
- for_each_file(td, f, i)
- td_io_close_file(td, f);
-
- return err;
+ td->total_io_size = td->o.size * td->o.loops;
+ return 0;
}
int init_random_map(struct thread_data *td)
@@ -557,19 +463,10 @@
f->filetype = FIO_TYPE_FILE;
if (!lstat(f->file_name, &sb)) {
- f->flags |= FIO_FILE_EXISTS;
-
if (S_ISBLK(sb.st_mode))
f->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
f->filetype = FIO_TYPE_CHAR;
- else {
- /*
- * might as well do this here, and save a stat later on
- */
- f->real_file_size = sb.st_size;
- f->file_size = f->real_file_size;
- }
}
}
diff --git a/fio.c b/fio.c
index bed1e28..2f0d740 100644
--- a/fio.c
+++ b/fio.c
@@ -412,7 +412,7 @@
td_set_runstate(td, TD_RUNNING);
- while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->io_size) {
+ while ((td->this_io_bytes[0] + td->this_io_bytes[1]) < td->o.size) {
struct timeval comp_time;
long bytes_done = 0;
int min_evts = 0;
diff --git a/fio.h b/fio.h
index ddc7e23..1e63f3b 100644
--- a/fio.h
+++ b/fio.h
@@ -237,8 +237,9 @@
FIO_FILE_OPEN = 1 << 0, /* file is open */
FIO_FILE_UNLINK = 1 << 1, /* unlink on close */
FIO_FILE_CLOSING = 1 << 2, /* file being closed */
- FIO_FILE_EXISTS = 1 << 3, /* no need to create */
- FIO_FILE_NOSORT = 1 << 4, /* don't sort verify blocks */
+ FIO_FILE_EXISTS = 1 << 3, /* file there */
+ FIO_FILE_EXTEND = 1 << 4, /* needs extend */
+ FIO_FILE_NOSORT = 1 << 5, /* don't sort verify blocks */
};
/*
@@ -255,11 +256,20 @@
unsigned long file_data;
int fd;
};
+
+ /*
+ * filename and possible memory mapping
+ */
char *file_name;
void *mmap;
- unsigned long long file_size;
+
+ /*
+ * size of the file, offset into file, and io size from that offset
+ */
unsigned long long real_file_size;
unsigned long long file_offset;
+ unsigned long long io_size;
+
unsigned long long last_pos;
unsigned long long last_completed_pos;
@@ -487,7 +497,6 @@
unsigned long rate_blocks;
struct timeval lastrate;
- unsigned long long io_size;
unsigned long long total_io_size;
unsigned long io_issues[2];
diff --git a/io_u.c b/io_u.c
index 2e0f8e9..31d3b14 100644
--- a/io_u.c
+++ b/io_u.c
@@ -100,7 +100,7 @@
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
int ddir, unsigned long long *b)
{
- unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir];
+ unsigned long long max_blocks = f->io_size / td->o.min_bs[ddir];
unsigned long long r, rb;
int loops = 5;
@@ -250,7 +250,7 @@
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
- if (max_bytes >= (td->io_size * td->o.rwmix[ddir] / 100)) {
+ if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) {
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
memcpy(&td->rw_end[ddir], &now, sizeof(now));
diff --git a/ioengines.c b/ioengines.c
index 4ab08ce..3e8d886 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -263,21 +263,27 @@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
- if (td->io_ops->open_file(td, f))
- return 1;
+ if (!td->io_ops->open_file(td, f)) {
+ f->last_free_lookup = 0;
+ f->last_completed_pos = 0;
+ f->last_pos = 0;
+ f->flags |= FIO_FILE_OPEN;
+ f->flags &= ~FIO_FILE_CLOSING;
- f->last_free_lookup = 0;
- f->last_completed_pos = 0;
- f->last_pos = 0;
- f->flags |= FIO_FILE_OPEN;
- f->flags &= ~FIO_FILE_CLOSING;
+ if (f->file_map)
+ memset(f->file_map, 0, f->num_maps * sizeof(long));
- if (f->file_map)
- memset(f->file_map, 0, f->num_maps * sizeof(long));
+ td->nr_open_files++;
+ get_file(f);
+ return 0;
+ }
- td->nr_open_files++;
- get_file(f);
- return 0;
+ if (td->error == EINVAL && td->o.odirect)
+ log_err("fio: destination does not support O_DIRECT\n");
+ if (td->error == EMFILE)
+ log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+
+ return 1;
}
void td_io_close_file(struct thread_data *td, struct fio_file *f)