Full readonly check

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 62240cd08d6650d85c43a267204aacd4be4914e9..47ddacfcddef8083b97e6c7f487af14d79475ae4 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -18,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
@@ -104,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;
 }
@@ -228,6 +233,8 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
                flags |= O_SYNC;
 
        if (td_write(td)) {
+               assert(!read_only);
+
                flags |= O_RDWR;
 
                if (f->filetype == FIO_TYPE_FILE)
@@ -238,7 +245,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;
@@ -378,6 +385,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
@@ -385,20 +394,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;
@@ -406,12 +422,12 @@ 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 || td->o.size > total_size)
@@ -422,7 +438,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) {
@@ -431,7 +447,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;
@@ -445,8 +461,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)