Add softrandommap and --alloc-size options
[fio.git] / filesetup.c
index eedb3dc341706f1914da0e8ccbde44474edc764f..b356b447ddaeadffa01f4d551ea868621cff3220 100644 (file)
@@ -30,12 +30,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;
@@ -94,9 +96,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;
@@ -116,11 +119,13 @@ err:
 
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-       unsigned long long ret;
+       unsigned long long ret, size_d;
        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 - td->o.file_size_low) * (r / (RAND_MAX + 1.0)));
+       size_d = td->o.file_size_high - td->o.file_size_low;
+       ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
+       ret += td->o.file_size_low;
        ret -= (ret % td->o.rw_min_bs);
        return ret;
 }
@@ -171,7 +176,8 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return ret;
 
        if (f->file_offset > f->real_file_size) {
-               log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name, f->file_offset, f->real_file_size);
+               log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name,
+                                       f->file_offset, f->real_file_size);
                return 1;
        }
 
@@ -193,13 +199,15 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
         */
        if (f->mmap)
                ret = madvise(f->mmap, f->io_size, MADV_DONTNEED);
-       else if (f->filetype == FIO_TYPE_FILE)
-               ret = fadvise(f->fd, f->file_offset, f->io_size, POSIX_FADV_DONTNEED);
-       else if (f->filetype == FIO_TYPE_BD) {
+       else if (f->filetype == FIO_TYPE_FILE) {
+               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()) {
                        if (!root_warn) {
-                               log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+                               log_err("fio: only root may flush block "
+                                       "devices. Cache flush bypassed!\n");
                                root_warn = 1;
                        }
                        ret = 0;
@@ -245,15 +253,13 @@ static int file_lookup_open(struct fio_file *f, int flags)
                f->lock_owner = __f->lock_owner;
                f->lock_batch = __f->lock_batch;
                f->lock_ddir = __f->lock_ddir;
-               f->fd = dup(__f->fd);
-               f->references++;
                from_hash = 1;
        } else {
                dprint(FD_FILE, "file not found in hash %s\n", f->file_name);
-               f->fd = open(f->file_name, flags, 0600);
                from_hash = 0;
        }
 
+       f->fd = open(f->file_name, flags, 0600);
        return from_hash;
 }
 
@@ -288,9 +294,8 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 
 open_again:
        if (td_write(td)) {
-               assert(!read_only);
-
-               flags |= O_RDWR;
+               if (!read_only)
+                       flags |= O_RDWR;
 
                if (f->filetype == FIO_TYPE_FILE)
                        flags |= O_CREAT;
@@ -320,10 +325,7 @@ open_again:
                        goto open_again;
                }
 
-               if (from_hash)
-                       snprintf(buf, sizeof(buf) - 1, "dup(%s)", f->file_name);
-               else
-                       snprintf(buf, sizeof(buf) - 1, "open(%s)",f->file_name);
+               snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
 
                td_verror(td, __e, buf);
        }
@@ -361,7 +363,8 @@ int open_files(struct thread_data *td)
                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);
+                               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);
@@ -392,7 +395,8 @@ static int get_file_sizes(struct thread_data *td)
        int err = 0;
 
        for_each_file(td, f, i) {
-               dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i, f->file_name);
+               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->error != ENOENT) {
@@ -424,6 +428,9 @@ int setup_files(struct thread_data *td)
 
        dprint(FD_FILE, "setup files\n");
 
+       if (td->o.read_iolog_file)
+               return 0;
+
        /*
         * if ioengine defines a setup() method, it's responsible for
         * opening the files and setting f->real_file_size to indicate
@@ -480,16 +487,19 @@ int setup_files(struct thread_data *td)
                                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) 
+                       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->file_offset;
-                       else
-                               f->io_size = get_rand_file_size(td) - f->file_offset;
+                       if (td->o.file_size_low == td->o.file_size_high) {
+                               f->io_size = td->o.file_size_low
+                                               - f->file_offset;
+                       } else {
+                               f->io_size = get_rand_file_size(td)
+                                               - f->file_offset;
+                       }
                } else
                        f->io_size = f->real_file_size - f->file_offset;
 
@@ -504,7 +514,7 @@ int setup_files(struct thread_data *td)
                        need_extend++;
                        extend_size += (f->io_size + f->file_offset);
                        f->flags |= FIO_FILE_EXTEND;
-               }       
+               }
        }
 
        if (!td->o.size || td->o.size > total_size)
@@ -560,14 +570,26 @@ int init_random_map(struct thread_data *td)
                return 0;
 
        for_each_file(td, f, i) {
-               blocks = (f->real_file_size + td->o.rw_min_bs - 1) / (unsigned long long) td->o.rw_min_bs;
-               num_maps = (blocks + BLOCKS_PER_MAP-1)/ (unsigned long long) BLOCKS_PER_MAP;
+               blocks = (f->real_file_size + td->o.rw_min_bs - 1) /
+                               (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) {
-                       log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+               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 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;
@@ -590,8 +612,10 @@ 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);
 
@@ -680,7 +704,8 @@ int add_file(struct thread_data *td, const char *fname)
        if (f->filetype == FIO_TYPE_FILE)
                td->nr_normal_files++;
 
-       dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name, cur_files);
+       dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name,
+                                                       cur_files);
 
        return cur_files;
 }
@@ -816,7 +841,8 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
                if (!S_ISDIR(sb.st_mode))
                        continue;
 
-               if ((ret = recurse_dir(td, full_path)) != 0)
+               ret = recurse_dir(td, full_path);
+               if (ret)
                        break;
        }