X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=filesetup.c;h=0f1a3402237a265d2480b5e865837938959ad6c1;hb=e85b2b83e39b64ba5cb73fbfddbf3902b6e84925;hp=4beb06e369c5061a364ed052d791c73fa2a99057;hpb=1549441cdfecb2c1a4a8b8d494253859d67b4344;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index 4beb06e3..0f1a3402 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"
@@ -99,14 +101,25 @@ static int create_files(struct thread_data *td)
 {
 	struct fio_file *f;
 	int err, need_create, can_extend;
+	unsigned long long total_file_size;
 	unsigned int i;
 
+	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;
+		}
 	}
 
 	/*
@@ -122,6 +135,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 / td->nr_normal_files;
 
 		file_there = !file_ok(td, f);
 
@@ -215,9 +232,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 +315,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 +395,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);
@@ -427,16 +445,25 @@ 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;
+		}
 	}
 }
 
 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));
@@ -448,7 +475,7 @@ void add_file(struct thread_data *td, const char *fname)
 
 	get_file_type(f);
 
-	td->open_files++;
+	td->files_index++;
 	if (f->filetype == FIO_TYPE_FILE)
 		td->nr_normal_files++;
 }
@@ -467,8 +494,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;
+
+		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);
+}