When opening a new file, check file limit not total number

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index c1107a42eb6f098a78a5e48cc25bfaae889df3fd..678e8365432ad94b8b7bd9e41170204901f1eef7 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"
@@ -297,6 +299,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;
        }
 
@@ -375,8 +379,6 @@ int setup_files(struct thread_data *td)
        for_each_file(td, f, i)
                td->total_file_size += f->file_size;
 
-       td->total_file_size = (td->total_file_size * td->nr_files) / td->open_files;
-
        td->io_size = td->total_file_size;
        if (td->io_size == 0) {
                log_err("%s: no io blocks\n", td->name);
@@ -467,8 +469,58 @@ void put_file(struct thread_data *td, struct fio_file *f)
        if (--f->references)
                return;
 
+       if (should_fsync(td) && td->fsync_on_close)
+               fsync(f->fd);
+
        if (td->io_ops->close_file)
                td->io_ops->close_file(td, 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;
+
+               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 (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
+                       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);
+}