X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=678e8365432ad94b8b7bd9e41170204901f1eef7;hp=919bdf49504eebdc4b69c1643bf128c9001cbac2;hb=8ab538730857ce3a29c5f00fb55b967468751ec9;hpb=1315a68a091816d284c5f46b28e419349aa821d8

diff --git a/filesetup.c b/filesetup.c
index 919bdf49..678e8365 100644
--- 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"
@@ -101,8 +103,13 @@ static int create_files(struct thread_data *td)
 	int err, need_create, can_extend;
 	unsigned int i;
 
-	for_each_file(td, f, i)
-		f->file_size = td->total_file_size / td->nr_files;
+	for_each_file(td, f, i) {
+		if (f->filetype != FIO_TYPE_FILE)
+			continue;
+
+		f->file_size = td->total_file_size / td->nr_normal_files;
+		f->file_offset = td->start_offset;
+	}
 
 	/*
 	 * unless specifically asked for overwrite, let normal io extend it
@@ -139,8 +146,8 @@ 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_uniq_files,
-				(td->total_file_size >> 20) / td->nr_uniq_files,
+				td->name, td->nr_normal_files,
+				(td->total_file_size >> 20) / td->nr_normal_files,
 				td->total_file_size >> 20);
 
 	err = 0;
@@ -292,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;
 	}
 
@@ -370,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);
@@ -431,7 +438,7 @@ static void get_file_type(struct fio_file *f)
 
 void add_file(struct thread_data *td, const char *fname)
 {
-	int cur_files = td->open_files;
+	int cur_files = td->files_index;
 	struct fio_file *f;
 
 	td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
@@ -443,8 +450,9 @@ void add_file(struct thread_data *td, const char *fname)
 
 	get_file_type(f);
 
-	td->open_files++;
-	td->nr_uniq_files = td->open_files;
+	td->files_index++;
+	if (f->filetype == FIO_TYPE_FILE)
+		td->nr_normal_files++;
 }
 
 void get_file(struct fio_file *f)
@@ -461,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);
+}