X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=3bd8633873cb7c40cb99c284a2d3ad7fdebadf4f;hp=48b034a6b4f83d4913e94a19a72611e8d1755e80;hb=96d32d518a0743a6c050057bc1562e4883e51c5d;hpb=cf3d609747c3e070001173b17ea95e9d6f46b15c

diff --git a/filesetup.c b/filesetup.c
index 48b034a6..3bd86338 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"
@@ -15,7 +17,7 @@ static int file_ok(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	if (td->filetype != FIO_TYPE_FILE ||
+	if (f->filetype != FIO_TYPE_FILE ||
 	    (td->io_ops->flags & FIO_DISKLESSIO))
 		return 0;
 
@@ -98,10 +100,27 @@ err:
 static int create_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err, need_create, can_extend;
+	int err, need_create, can_extend;
+	unsigned long long total_file_size;
+	unsigned int i;
 
-	for_each_file(td, f, i)
-		f->file_size = td->total_file_size / td->nr_files;
+	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;
+
+		if (f->flags & FIO_FILE_EXISTS) {
+			s = f->file_size;
+			if (s > total_file_size)
+				s = total_file_size;
+
+			total_file_size -= s;
+		}
+	}
 
 	/*
 	 * unless specifically asked for overwrite, let normal io extend it
@@ -111,17 +130,24 @@ static int create_files(struct thread_data *td)
 		return 0;
 
 	need_create = 0;
-	if (td->filetype == FIO_TYPE_FILE) {
-		for_each_file(td, f, i) {
-			int file_there = !file_ok(td, f);
+	for_each_file(td, f, i) {
+		int file_there;
 
-			if (file_there && td_write(td) && !td->overwrite) {
-				unlink(f->file_name);
-				file_there = 0;
-			}
+		if (f->filetype != FIO_TYPE_FILE)
+			continue;
+		if (f->flags & FIO_FILE_EXISTS)
+			continue;
+
+		f->file_size = total_file_size / td->nr_normal_files;
 
-			need_create += !file_there;
+		file_there = !file_ok(td, f);
+
+		if (file_there && td_write(td) && !td->overwrite) {
+			unlink(f->file_name);
+			file_there = 0;
 		}
+
+		need_create += !file_there;
 	}
 
 	if (!need_create)
@@ -135,8 +161,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;
@@ -144,9 +170,11 @@ static int create_files(struct thread_data *td)
 		/*
 		 * Only unlink files that we created.
 		 */
-		f->unlink = 0;
+		f->flags &= ~FIO_FILE_UNLINK;
 		if (file_ok(td, f)) {
-			f->unlink = td->unlink;
+			if (td->unlink)
+				f->flags |= FIO_FILE_UNLINK;
+
 			err = create_file(td, f);
 			if (err)
 				break;
@@ -204,9 +232,10 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (td->filetype == FIO_TYPE_FILE)
-		ret = file_size(td, f);
-	else if (td->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;
@@ -234,11 +263,11 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	 */
 	if (f->mmap)
 		ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
-	else if (td->filetype == FIO_TYPE_FILE) {
+	else if (f->filetype == FIO_TYPE_FILE) {
 		ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
-	} else if (td->filetype == FIO_TYPE_BD) {
+	} else if (f->filetype == FIO_TYPE_BD) {
 		ret = blockdev_invalidate_cache(f->fd);
-	} else if (td->filetype == FIO_TYPE_CHAR)
+	} else if (f->filetype == FIO_TYPE_CHAR)
 		ret = 0;
 
 	if (ret < 0) {
@@ -267,12 +296,12 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 	if (td_write(td) || td_rw(td)) {
 		flags |= O_RDWR;
 
-		if (td->filetype == FIO_TYPE_FILE)
+		if (f->filetype == FIO_TYPE_FILE)
 			flags |= O_CREAT;
 
 		f->fd = open(f->file_name, flags, 0600);
 	} else {
-		if (td->filetype == FIO_TYPE_CHAR)
+		if (f->filetype == FIO_TYPE_CHAR)
 			flags |= O_RDWR;
 		else
 			flags |= O_RDONLY;
@@ -286,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;
 	}
 
@@ -316,7 +347,8 @@ err:
 int open_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err = 0;
+	unsigned int i;
+	int err = 0;
 
 	for_each_file(td, f, i) {
 		err = td_io_open_file(td, f);
@@ -339,7 +371,8 @@ int open_files(struct thread_data *td)
 int setup_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int err, i;
+	unsigned int i;
+	int err;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
@@ -362,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);
@@ -385,11 +416,11 @@ int setup_files(struct thread_data *td)
 void close_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i;
+	unsigned int i;
 
 	for_each_file(td, f, i) {
-		if (!td->filename && f->unlink &&
-		    td->filetype == FIO_TYPE_FILE) {
+		if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
+		    f->filetype == FIO_TYPE_FILE) {
 			unlink(f->file_name);
 			free(f->file_name);
 			f->file_name = NULL;
@@ -406,3 +437,119 @@ void close_files(struct thread_data *td)
 	td->files = NULL;
 	td->nr_files = 0;
 }
+
+static void get_file_type(struct fio_file *f)
+{
+	struct stat sb;
+
+	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->files_index;
+	struct fio_file *f;
+
+	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);
+
+	get_file_type(f);
+
+	td->files_index++;
+	if (f->filetype == FIO_TYPE_FILE)
+		td->nr_normal_files++;
+}
+
+void get_file(struct fio_file *f)
+{
+	f->references++;
+}
+
+void put_file(struct thread_data *td, struct fio_file *f)
+{
+	if (!(f->flags & FIO_FILE_OPEN))
+		return;
+
+	assert(f->references);
+	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;
+
+		/*
+		 * check d_ino here?
+		 */
+
+		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);
+}