Clear f on error get_next_file_rr()
[fio.git] / filesetup.c
index 98479fd04fbebf9b2d24834e9e793f75c5447650..04d7b987085f00eb2e195e8a469d39adffede7b4 100644 (file)
@@ -33,12 +33,14 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
         * does that for operations involving reads, or for writes
         * where overwrite is set
         */
-       if (td_read(td) || (td_write(td) && td->o.overwrite))
+       if (td_read(td) || (td_write(td) && td->o.overwrite) ||
+           (td_write(td) && td->io_ops->flags & FIO_NOEXTEND))
                new_layout = 1;
        if (td_write(td) && !td->o.overwrite)
                unlink_file = 1;
 
        if (unlink_file || new_layout) {
+               dprint(FD_FILE, "layout unlink %s\n", f->file_name);
                if ((unlink(f->file_name) < 0) && (errno != ENOENT)) {
                        td_verror(td, errno, "unlink");
                        return 1;
@@ -66,12 +68,13 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                goto err;
        }
 
+#ifdef FIO_HAVE_FALLOCATE
        dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
                                                        f->real_file_size);
-       if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
-               td_verror(td, errno, "posix_fallocate");
-               goto err;
-       }
+       r = posix_fallocate(f->fd, 0, f->real_file_size);
+       if (r < 0)
+               log_err("fio: posix_fallocate fails: %s\n", strerror(-r));
+#endif
 
        b = malloc(td->o.max_bs[DDIR_WRITE]);
        memset(b, 0, td->o.max_bs[DDIR_WRITE]);
@@ -97,9 +100,10 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       if (td->terminate)
+       if (td->terminate) {
+               dprint(FD_FILE, "terminate unlink %s\n", f->file_name);
                unlink(f->file_name);
-       else if (td->o.create_fsync) {
+       else if (td->o.create_fsync) {
                if (fsync(f->fd) < 0) {
                        td_verror(td, errno, "fsync");
                        goto err;
@@ -117,12 +121,12 @@ err:
 
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-       unsigned long long ret, size_d;
+       unsigned long long ret, sized;
        long r;
 
        r = os_random_long(&td->file_size_state);
-       size_d = td->o.file_size_high - td->o.file_size_low;
-       ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
+       sized = td->o.file_size_high - td->o.file_size_low;
+       ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
        ret += td->o.file_size_low;
        ret -= (ret % td->o.rw_min_bs);
        return ret;
@@ -132,7 +136,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
        struct stat st;
 
-       if (fstat(f->fd, &st) == -1) {
+       if (stat(f->file_name, &st) == -1) {
                td_verror(td, errno, "fstat");
                return 1;
        }
@@ -146,14 +150,28 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
        unsigned long long bytes;
        int r;
 
+       if (td->io_ops->open_file(td, f)) {
+               log_err("fio: failed opening blockdev %s for size check\n",
+                       f->file_name);
+               return 1;
+       }
+
        r = blockdev_size(f->fd, &bytes);
        if (r) {
                td_verror(td, r, "blockdev_size");
-               return 1;
+               goto err;
+       }
+
+       if (!bytes) {
+               log_err("%s: zero sized block device?\n", f->file_name);
+               goto err;
        }
 
        f->real_file_size = bytes;
        return 0;
+err:
+       td->io_ops->close_file(td, f);
+       return 1;
 }
 
 static int get_file_size(struct thread_data *td, struct fio_file *f)
@@ -231,6 +249,9 @@ static int __file_invalidate_cache(struct thread_data *td, struct fio_file *f,
 
 int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
+       if (!(f->flags & FIO_FILE_OPEN))
+               return 0;
+
        return __file_invalidate_cache(td, f, -1, -1);
 }
 
@@ -301,7 +322,9 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
        if (td->o.sync_io)
                flags |= O_SYNC;
        if (f->filetype != FIO_TYPE_FILE)
-               flags |= O_NOATIME;
+               flags |= FIO_O_NOATIME;
+       if (td->o.create_on_open)
+               flags |= O_CREAT;
 
 open_again:
        if (td_write(td)) {
@@ -331,8 +354,8 @@ open_again:
                char buf[FIO_VERROR_SIZE];
                int __e = errno;
 
-               if (errno == EPERM && (flags & O_NOATIME)) {
-                       flags &= ~O_NOATIME;
+               if (errno == EPERM && (flags & FIO_O_NOATIME)) {
+                       flags &= ~FIO_O_NOATIME;
                        goto open_again;
                }
 
@@ -341,9 +364,6 @@ open_again:
                td_verror(td, __e, buf);
        }
 
-       if (get_file_size(td, f))
-               goto err;
-
        if (!from_hash && f->fd != -1) {
                if (add_file_hash(f)) {
                        int ret;
@@ -357,43 +377,11 @@ open_again:
        }
 
        return 0;
-err:
-       close(f->fd);
-       return 1;
 }
 
-int open_files(struct thread_data *td)
+int generic_get_file_size(struct thread_data *td, struct fio_file *f)
 {
-       struct fio_file *f;
-       unsigned int i;
-       int err = 0;
-
-       dprint(FD_FILE, "open files\n");
-
-       for_each_file(td, f, i) {
-               err = td_io_open_file(td, f);
-               if (err) {
-                       if (td->error == EMFILE) {
-                               log_err("fio: limited open files to: %d\n",
-                                                       td->nr_open_files);
-                               td->o.open_files = td->nr_open_files;
-                               err = 0;
-                               clear_error(td);
-                       }
-                       break;
-               }
-
-               if (td->o.open_files == td->nr_open_files)
-                       break;
-       }
-
-       if (!err)
-               return 0;
-
-       for_each_file(td, f, i)
-               td_io_close_file(td, f);
-
-       return err;
+       return get_file_size(td, f);
 }
 
 /*
@@ -409,15 +397,12 @@ static int get_file_sizes(struct thread_data *td)
                dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i,
                                                                f->file_name);
 
-               if (td->io_ops->open_file(td, f)) {
+               if (td_io_get_file_size(td, f)) {
                        if (td->error != ENOENT) {
                                log_err("%s\n", td->verror);
                                err = 1;
                        }
                        clear_error(td);
-               } else {
-                       if (td->io_ops->close_file)
-                               td->io_ops->close_file(td, f);
                }
 
                if (f->real_file_size == -1ULL && td->o.size)
@@ -522,8 +507,11 @@ int setup_files(struct thread_data *td)
                if (f->filetype == FIO_TYPE_FILE &&
                    (f->io_size + f->file_offset) > f->real_file_size &&
                    !(td->io_ops->flags & FIO_DISKLESSIO)) {
-                       need_extend++;
-                       extend_size += (f->io_size + f->file_offset);
+                       if (!td->o.create_on_open) {
+                               need_extend++;
+                               extend_size += (f->io_size + f->file_offset);
+                       } else
+                               f->real_file_size = f->io_size + f->file_offset;
                        f->flags |= FIO_FILE_EXTEND;
                }
        }
@@ -536,8 +524,10 @@ int setup_files(struct thread_data *td)
         */
        if (need_extend) {
                temp_stall_ts = 1;
-               log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
-                       td->o.name, need_extend, extend_size >> 20);
+               if (!terse_output)
+                       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) {
                        unsigned long long old_len, extend_len;
@@ -596,14 +586,22 @@ int init_random_map(struct thread_data *td)
                                (unsigned long long) td->o.rw_min_bs;
                num_maps = (blocks + BLOCKS_PER_MAP - 1) /
                                (unsigned long long) BLOCKS_PER_MAP;
-               f->file_map = smalloc(num_maps * sizeof(long));
-               if (!f->file_map) {
+               f->file_map = smalloc(num_maps * sizeof(int));
+               if (f->file_map) {
+                       f->num_maps = num_maps;
+                       continue;
+               }
+               if (!td->o.softrandommap) {
                        log_err("fio: failed allocating random map. If running"
                                " a large number of jobs, try the 'norandommap'"
-                               " option\n");
+                               " option or set 'softrandommap'. Or give"
+                               " a larger --alloc-size to fio.\n");
                        return 1;
                }
-               f->num_maps = num_maps;
+
+               log_info("fio: file %s failed allocating random map. Running "
+                        "job without.\n", f->file_name);
+               f->num_maps = 0;
        }
 
        return 0;
@@ -626,10 +624,13 @@ void close_and_free_files(struct thread_data *td)
        dprint(FD_FILE, "close files\n");
 
        for_each_file(td, f, i) {
-               if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
+               if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
+                       dprint(FD_FILE, "free unlink %s\n", f->file_name);
                        unlink(f->file_name);
+               }
 
                td_io_close_file(td, f);
+               remove_file_hash(f);
 
                sfree(f->file_name);
                f->file_name = NULL;
@@ -677,11 +678,21 @@ int add_file(struct thread_data *td, const char *fname)
        dprint(FD_FILE, "add file %s\n", fname);
 
        f = smalloc(sizeof(*f));
+       if (!f) {
+               log_err("fio: smalloc OOM\n");
+               assert(0);
+       }
+               
        f->fd = -1;
 
-       dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
+       if (td->files_size <= td->files_index) {
+               int new_size = td->o.nr_files + 1;
+
+               dprint(FD_FILE, "resize file array to %d files\n", new_size);
 
-       td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+               td->files = realloc(td->files, new_size * sizeof(f));
+               td->files_size = new_size;
+       }
        td->files[cur_files] = f;
 
        /*
@@ -695,7 +706,11 @@ int add_file(struct thread_data *td, const char *fname)
 
        sprintf(file_name + len, "%s", fname);
        f->file_name = smalloc_strdup(file_name);
-
+       if (!f->file_name) {
+               log_err("fio: smalloc OOM\n");
+               assert(0);
+       }
+       
        get_file_type(f);
 
        switch (td->o.file_lock_mode) {
@@ -749,7 +764,7 @@ int put_file(struct thread_data *td, struct fio_file *f)
                ret = td->io_ops->close_file(td, f);
 
        if (!ret)
-               ret = !f_ret;
+               ret = f_ret;
 
        td->nr_open_files--;
        f->flags &= ~FIO_FILE_OPEN;
@@ -888,9 +903,20 @@ void dup_files(struct thread_data *td, struct thread_data *org)
                struct fio_file *__f;
 
                __f = smalloc(sizeof(*__f));
-
-               if (f->file_name)
+               if (!__f) {
+                       log_err("fio: smalloc OOM\n");
+                       assert(0);
+               }
+       
+               if (f->file_name) {
                        __f->file_name = smalloc_strdup(f->file_name);
+                       if (!__f->file_name) {
+                               log_err("fio: smalloc OOM\n");
+                               assert(0);
+                       }
+       
+                       __f->filetype = f->filetype;
+               }
 
                td->files[i] = __f;
        }