[PATCH] Must use ->real_file_size
[fio.git] / filesetup.c
index 4f3d6cdf7ea4e4e62915343e00e2c5ede8bb52bd..a14cd9503a68dbab9a656b78a3fd92726d46b07c 100644 (file)
@@ -8,24 +8,30 @@
 #include "fio.h"
 #include "os.h"
 
-static int create_file(struct thread_data *td, struct fio_file *f)
+/*
+ * Check if the file exists and it's large enough.
+ */
+static int file_ok(struct thread_data *td, struct fio_file *f)
 {
-       unsigned long long left;
-       unsigned int bs;
        struct stat st;
-       char *b;
-       int r;
 
        if (td->filetype != FIO_TYPE_FILE)
                return 0;
 
-       if (stat(f->file_name, &st) == -1) {
-               if (!td->create_file) {
-                       td_verror(td, ENOENT);
-                       return 1;
-               }
-       } else if (st.st_size >= (off_t) f->file_size)
-               return 0;
+       if (stat(f->file_name, &st) == -1)
+               return 1;
+       else 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)
+{
+       unsigned long long left;
+       unsigned int bs;
+       char *b;
+       int r;
 
        f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
        if (f->fd < 0) {
@@ -38,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;
 
@@ -80,18 +91,24 @@ err:
 static int create_files(struct thread_data *td)
 {
        struct fio_file *f;
-       int i, err;
+       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) {
-               td->io_size = td->total_file_size;
+       if (!td->overwrite)
+               return 0;
+
+       need_create = 0;
+       if (td->filetype == FIO_TYPE_FILE)
                for_each_file(td, f, i)
-                       f->file_size = td->total_file_size / td->nr_files;
+                       need_create += file_ok(td, f);
 
+       if (!need_create)
                return 0;
-       }
 
        if (!td->total_file_size) {
                log_err("Need size for create\n");
@@ -100,17 +117,23 @@ static int create_files(struct thread_data *td)
        }
 
        temp_stall_ts = 1;
-       fprintf(f_out, "%s: Laying out IO file(s) (%LuMiB)\n",
-                                       td->name, td->total_file_size >> 20);
+       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) {
-               f->file_size = td->total_file_size / td->nr_files;
-               err = create_file(td, f);
-               if (err)
-                       break;
-
-               td->io_size += f->file_size;
+               /*
+                * 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;
+               }
        }
 
        temp_stall_ts = 0;
@@ -133,7 +156,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
                        f->file_size = f->real_file_size;
        }
 
-       f->file_size -= f->file_offset;
+       f->file_size = f->real_file_size - f->file_offset;
        return 0;
 }
 
@@ -179,7 +202,6 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
-       td->io_size += f->file_size;
        return 0;
 }
 
@@ -300,18 +322,18 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 
        if (td->odirect)
                flags |= OS_O_DIRECT;
+       if (td->sync_io)
+               flags |= O_SYNC;
 
        if (td_write(td) || td_rw(td)) {
+               flags |= O_RDWR;
+
                if (td->filetype == FIO_TYPE_FILE) {
                        if (!td->overwrite)
                                flags |= O_TRUNC;
 
                        flags |= O_CREAT;
                }
-               if (td->sync_io)
-                       flags |= O_SYNC;
-
-               flags |= O_RDWR;
 
                f->fd = open(f->file_name, flags, 0600);
        } else {
@@ -334,10 +356,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
@@ -349,12 +395,18 @@ int setup_files(struct thread_data *td)
        if (create_files(td))
                return 1;
 
-       for_each_file(td, f, i) {
-               err = setup_file(td, f);
-               if (err)
-                       break;
-       }
+       err = open_files(td);
+       if (err)
+               return err;
 
+       /*
+        * Recalculate the total file size now that files are set up.
+        */
+       td->total_file_size = 0;
+       for_each_file(td, f, i)
+               td->total_file_size += f->file_size;
+
+       td->io_size = td->total_file_size;
        if (td->io_size == 0) {
                log_err("%s: no io blocks\n", td->name);
                td_verror(td, EINVAL);
@@ -367,21 +419,33 @@ 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)
 {
+       struct fio_file *f;
        int i;
 
-       for (i = 0; i < td->nr_files; i++) {
-               struct fio_file *f = &td->files[i];
-
+       for_each_file(td, f, i) {
+               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) {
-                       if (td->unlink && td->filetype == FIO_TYPE_FILE)
-                               unlink(f->file_name);
                        close(f->fd);
                        f->fd = -1;
                }
@@ -390,4 +454,9 @@ void close_files(struct thread_data *td)
                        f->mmap = NULL;
                }
        }
+
+       td->filename = NULL;
+       free(td->files);
+       td->files = NULL;
+       td->nr_files = 0;
 }