New/old file mix fix

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 2a7e7cf55e33e31e9bd1e6a23eb260d1ee895c9b..abcdc1d05da17051073124457d7be62ab461e124 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -2,8 +2,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <assert.h>
+#include <dirent.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/types.h>
 
 #include "fio.h"
 #include "os.h"
@@ -99,14 +101,27 @@ static int create_files(struct thread_data *td)
 {
        struct fio_file *f;
        int err, need_create, can_extend;
-       unsigned int i;
+       unsigned long long total_file_size;
+       unsigned int i, new_files;
 
+       new_files = 0;
+       total_file_size = td->total_file_size;
        for_each_file(td, f, i) {
+               unsigned long long s;
+
+               f->file_offset = td->start_offset;
+
                if (f->filetype != FIO_TYPE_FILE)
                        continue;
 
-               f->file_size = td->total_file_size / td->nr_normal_files;
-               f->file_offset = td->start_offset;
+               if (f->flags & FIO_FILE_EXISTS) {
+                       s = f->file_size;
+                       if (s > total_file_size)
+                               s = total_file_size;
+
+                       total_file_size -= s;
+               } else
+                       new_files++;
        }
 
        /*
@@ -122,6 +137,10 @@ static int create_files(struct thread_data *td)
 
                if (f->filetype != FIO_TYPE_FILE)
                        continue;
+               if (f->flags & FIO_FILE_EXISTS)
+                       continue;
+
+               f->file_size = total_file_size / new_files;
 
                file_there = !file_ok(td, f);
 
@@ -144,9 +163,9 @@ static int create_files(struct thread_data *td)
 
        temp_stall_ts = 1;
        fprintf(f_out, "%s: Laying out IO file(s) (%u x %LuMiB == %LuMiB)\n",
-                               td->name, td->nr_normal_files,
-                               (td->total_file_size >> 20) / td->nr_normal_files,
-                               td->total_file_size >> 20);
+                               td->name, new_files,
+                               (total_file_size >> 20) / new_files,
+                               total_file_size >> 20);
 
        err = 0;
        for_each_file(td, f, i) {
@@ -215,9 +234,10 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
        int ret = 0;
 
-       if (f->filetype == FIO_TYPE_FILE)
-               ret = file_size(td, f);
-       else if (f->filetype == FIO_TYPE_BD)
+       if (f->filetype == FIO_TYPE_FILE) {
+               if (!(f->flags & FIO_FILE_EXISTS))
+                       ret = file_size(td, f);
+       } else if (f->filetype == FIO_TYPE_BD)
                ret = bdev_size(td, f);
        else
                f->real_file_size = -1;
@@ -297,6 +317,8 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
                td_verror(td, __e, "open");
                if (__e == EINVAL && td->odirect)
                        log_err("fio: destination does not support O_DIRECT\n");
+               if (__e == EMFILE)
+                       log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->nr_files);
                return 1;
        }
 
@@ -425,10 +447,19 @@ static void get_file_type(struct fio_file *f)
        f->filetype = FIO_TYPE_FILE;
 
        if (!lstat(f->file_name, &sb)) {
+               f->flags |= FIO_FILE_EXISTS;
+
                if (S_ISBLK(sb.st_mode))
                        f->filetype = FIO_TYPE_BD;
                else if (S_ISCHR(sb.st_mode))
                        f->filetype = FIO_TYPE_CHAR;
+               else {
+                       /*
+                        * might as well do this here, and save a stat later on
+                        */
+                       f->real_file_size = sb.st_size;
+                       f->file_size = f->real_file_size;
+               }
        }
 }
 
@@ -473,3 +504,50 @@ void put_file(struct thread_data *td, struct fio_file *f)
        td->nr_open_files--;
        f->flags &= ~FIO_FILE_OPEN;
 }
+
+static int recurse_dir(struct thread_data *td, const char *dirname)
+{
+       struct dirent *dir;
+       int ret = 0;
+       DIR *D;
+
+       D = opendir(dirname);
+       if (!D) {
+               td_verror(td, errno, "opendir");
+               return 1;
+       }
+
+       while ((dir = readdir(D)) != NULL) {
+               char full_path[PATH_MAX];
+               struct stat sb;
+
+               if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
+                       continue;
+
+               sprintf(full_path, "%s/%s", dirname, dir->d_name);
+
+               if (lstat(full_path, &sb) == -1) {
+                       if (errno != ENOENT) {
+                               td_verror(td, errno, "stat");
+                               return 1;
+                       }
+               }
+
+               if (S_ISREG(sb.st_mode)) {
+                       add_file(td, full_path);
+                       td->nr_files++;
+                       continue;
+               }
+
+               if ((ret = recurse_dir(td, full_path)) != 0)
+                       break;
+       }
+
+       closedir(D);
+       return ret;
+}
+
+int add_dir_files(struct thread_data *td, const char *path)
+{
+       return recurse_dir(td, path);
+}