Don't completely fail for block device flushing failure
[fio.git] / filesetup.c
index 3b3f8684366ea6321915e4861bcce981dc2d8fcf..fb9219199e31ca378a24b2662f246167abe6a3fe 100644 (file)
@@ -119,6 +119,28 @@ static unsigned long long set_rand_file_size(struct thread_data *td,
        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;
@@ -133,10 +155,20 @@ static int create_files(struct thread_data *td)
 
                f->file_offset = td->o.start_offset;
 
-               if (f->filetype != FIO_TYPE_FILE)
+               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;
@@ -150,8 +182,17 @@ static int create_files(struct thread_data *td)
         * unless specifically asked for overwrite, let normal io extend it
         */
        can_extend = !td->o.overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
-       if (can_extend)
+       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)
@@ -170,22 +211,11 @@ static int create_files(struct thread_data *td)
                        continue;
                }
 
-               if (!td->o.file_size_low)
-                       f->file_size = total_file_size / new_files;
-               else {
-                       /*
-                        * If we don't have enough space left for a file
-                        * of the minimum size, bail.
-                        */
-                       if (local_file_size < td->o.file_size_low) {
-                               log_info("fio: limited to %d files\n", i);
-                               new_files -= (td->o.nr_files - i);
-                               td->o.nr_files = i;
-                               break;
-                       }
-
-                       f->file_size = set_rand_file_size(td, local_file_size);
-                       local_file_size -= f->file_size;
+               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;
@@ -223,6 +253,7 @@ static int create_files(struct thread_data *td)
                        if (td->o.unlink)
                                f->flags |= FIO_FILE_UNLINK;
 
+                       f->flags |= FIO_FILE_NOSORT;
                        err = create_file(td, f);
                        if (err)
                                break;
@@ -313,9 +344,13 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
                ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
        else if (f->filetype == FIO_TYPE_FILE)
                ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
-       else if (f->filetype == FIO_TYPE_BD)
+       else if (f->filetype == FIO_TYPE_BD) {
                ret = blockdev_invalidate_cache(f->fd);
-       else if (f->filetype == FIO_TYPE_CHAR)
+               if (ret < 0 && errno == EACCES && geteuid()) {
+                       log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+                       ret = 0;
+               }
+       } else if (f->filetype == FIO_TYPE_CHAR)
                ret = 0;
 
        if (ret < 0) {
@@ -358,9 +393,12 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
        }
 
        if (f->fd == -1) {
+               char buf[FIO_VERROR_SIZE];
                int __e = errno;
 
-               td_verror(td, __e, "open");
+               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)
@@ -374,6 +412,9 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
        if (td->o.invalidate_cache && file_invalidate_cache(td, f))
                goto err;
 
+       if (!td->o.fadvise_hint)
+               return 0;
+
        if (!td_random(td)) {
                if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
                        td_verror(td, errno, "fadvise");
@@ -461,26 +502,53 @@ int setup_files(struct thread_data *td)
        return err;
 }
 
+int init_random_map(struct thread_data *td)
+{
+       int num_maps, blocks;
+       struct fio_file *f;
+       unsigned int i;
+
+       if (td->o.norandommap)
+               return 0;
+
+       for_each_file(td, f, i) {
+               blocks = (f->real_file_size + td->o.rw_min_bs - 1) / td->o.rw_min_bs;
+               num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
+               f->file_map = malloc(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");
+                       return 1;
+               }
+               f->num_maps = num_maps;
+               memset(f->file_map, 0, num_maps * sizeof(long));
+       }
+
+       return 0;
+}
+
 void close_files(struct thread_data *td)
 {
        struct fio_file *f;
        unsigned int i;
 
        for_each_file(td, f, i) {
-               if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
-                   f->filetype == FIO_TYPE_FILE) {
+               if ((f->flags & FIO_FILE_UNLINK) &&
+                   f->filetype == FIO_TYPE_FILE)
                        unlink(f->file_name);
-                       free(f->file_name);
-                       f->file_name = NULL;
-               }
 
                td_io_close_file(td, f);
 
-               if (f->file_map)
+               free(f->file_name);
+               f->file_name = NULL;
+
+               if (f->file_map) {
                        free(f->file_map);
+                       f->file_map = NULL;
+               }
        }
 
        td->o.filename = NULL;
+       free(td->files);
        td->files = NULL;
        td->o.nr_files = 0;
 }
@@ -511,14 +579,21 @@ static void get_file_type(struct fio_file *f)
 void add_file(struct thread_data *td, const char *fname)
 {
        int cur_files = td->files_index;
+       char file_name[PATH_MAX];
        struct fio_file *f;
+       int len = 0;
 
        td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
 
        f = &td->files[cur_files];
        memset(f, 0, sizeof(*f));
        f->fd = -1;
-       f->file_name = strdup(fname);
+
+       if (td->o.directory)
+               len = sprintf(file_name, "%s/", td->o.directory);
+
+       sprintf(file_name + len, "%s", fname);
+       f->file_name = strdup(file_name);
 
        get_file_type(f);
 
@@ -596,3 +671,22 @@ int add_dir_files(struct thread_data *td, const char *path)
 {
        return recurse_dir(td, path);
 }
+
+void dup_files(struct thread_data *td, struct thread_data *org)
+{
+       struct fio_file *f;
+       unsigned int i;
+       size_t bytes;
+
+       if (!org->files)
+               return;
+
+       bytes = org->files_index * sizeof(*f);
+       td->files = malloc(bytes);
+       memcpy(td->files, org->files, bytes);
+
+       for_each_file(td, f, i) {
+               if (f->file_name)
+                       f->file_name = strdup(f->file_name);
+       }
+}