X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=ad3b7938ef4c41727f58d67f10228c69d89da863;hp=d8135ef08342ce05b0201fdf2fb8e8a8760afc3c;hb=f4c4f4d74bf101a685f3f9839144c52c4ed29e30;hpb=c6441dc9e95cba2a31dec63272917fdf496c75c4

diff --git a/filesetup.c b/filesetup.c
index d8135ef0..ad3b7938 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,8 @@ static int file_ok(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	if (td->filetype != FIO_TYPE_FILE || (td->io_ops->flags & FIO_NULLIO))
+	if (f->filetype != FIO_TYPE_FILE ||
+	    (td->io_ops->flags & FIO_DISKLESSIO))
 		return 0;
 
 	if (lstat(f->file_name, &st) == -1)
@@ -94,32 +97,105 @@ err:
 	return 1;
 }
 
+static unsigned long long set_rand_file_size(struct thread_data *td,
+					     unsigned long long total_size)
+{
+	unsigned long long upper = total_size;
+	unsigned long long ret;
+	long r;
+
+	if (upper > td->file_size_high)
+		upper = td->file_size_high;
+	else if (upper < td->file_size_low)
+		return 0;
+	else if (!upper)
+		return 0;
+
+	r = os_random_long(&td->file_size_state);
+	ret = td->file_size_low + (unsigned long long) ((double) upper * (r / (RAND_MAX + 1.0)));
+	ret -= (ret % td->rw_min_bs);
+	if (ret > upper)
+		ret = upper;
+	return ret;
+}
+
 static int create_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err, need_create;
+	int err, need_create, can_extend;
+	unsigned long long total_file_size, local_file_size;
+	unsigned int i, new_files;
 
-	for_each_file(td, f, i)
-		f->file_size = td->total_file_size / td->nr_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;
+
+		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++;
+	}
 
 	/*
 	 * unless specifically asked for overwrite, let normal io extend it
 	 */
-	if (!td->overwrite)
+	can_extend = !td->overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
+	if (can_extend)
 		return 0;
 
+	local_file_size = total_file_size;
+	if (!local_file_size)
+		local_file_size = -1;
+
+	total_file_size = 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) {
+			total_file_size += f->file_size;
+			continue;
+		}
+
+		if (!td->file_size_low)
+			f->file_size = total_file_size / new_files;
+		else {
+			/*
+			 * If we don't have enough space left for a file
+			 * of the minimum size, bail.
+			 */
+			if (local_file_size < td->file_size_low) {
+				log_info("fio: limited to %d files\n", i);
+				new_files -= (td->nr_files - i);
+				td->nr_files = i;
+				break;
 			}
 
-			need_create += !file_there;
+			f->file_size = set_rand_file_size(td, local_file_size);
+			local_file_size -= f->file_size;
 		}
+
+		total_file_size += f->file_size;
+		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)
@@ -132,19 +208,19 @@ 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->total_file_size >> 20);
+	log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+				td->name, new_files, total_file_size >> 20);
 
 	err = 0;
 	for_each_file(td, f, i) {
 		/*
 		 * 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;
@@ -159,16 +235,6 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	/*
-	 * if we are not doing real io, just pretend the file is as large
-	 * as the size= given. this works fine with nrfiles > 1 as well,
-	 * we only really care about it being at least as big as size=
-	 */
-	if (td->io_ops->flags & FIO_NULLIO) {
-		f->real_file_size = f->file_size = td->total_file_size;
-		return 0;
-	}
-
 	if (td->overwrite) {
 		if (fstat(f->fd, &st) == -1) {
 			td_verror(td, errno, "fstat");
@@ -212,9 +278,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,18 +301,19 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
+	if (td->odirect)
+		return 0;
+
 	/*
 	 * FIXME: add blockdev flushing too
 	 */
-	if (td->io_ops->flags & FIO_MMAPIO)
+	if (f->mmap)
 		ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
-	else if (td->filetype == FIO_TYPE_FILE) {
-		if (!td->odirect)
-			ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
-	} else if (td->filetype == FIO_TYPE_BD) {
-		if (!td->odirect)
-			ret = blockdev_invalidate_cache(f->fd);
-	} else if (td->filetype == FIO_TYPE_CHAR)
+	else if (f->filetype == FIO_TYPE_FILE) {
+		ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+	} else if (f->filetype == FIO_TYPE_BD) {
+		ret = blockdev_invalidate_cache(f->fd);
+	} else if (f->filetype == FIO_TYPE_CHAR)
 		ret = 0;
 
 	if (ret < 0) {
@@ -256,168 +324,92 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	return ret;
 }
 
-static int __setup_file_mmap(struct thread_data *td, struct fio_file *f)
+void generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
 {
-	int flags;
+	close(f->fd);
+	f->fd = -1;
+}
 
-	if (td_rw(td))
-		flags = PROT_READ | PROT_WRITE;
-	else if (td_write(td)) {
-		flags = PROT_WRITE;
+int generic_open_file(struct thread_data *td, struct fio_file *f)
+{
+	int flags = 0;
 
-		if (td->verify != VERIFY_NONE)
-			flags |= PROT_READ;
-	} else
-		flags = PROT_READ;
+	if (td->odirect)
+		flags |= OS_O_DIRECT;
+	if (td->sync_io)
+		flags |= O_SYNC;
 
-	f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
-	if (f->mmap == MAP_FAILED) {
-		f->mmap = NULL;
-		td_verror(td, errno, "mmap");
-		return 1;
-	}
+	if (td_write(td) || td_rw(td)) {
+		flags |= O_RDWR;
 
-	if (td->invalidate_cache && file_invalidate_cache(td, f))
-		return 1;
+		if (f->filetype == FIO_TYPE_FILE)
+			flags |= O_CREAT;
 
-	if (!td_random(td)) {
-		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno, "madvise");
-			return 1;
-		}
+		f->fd = open(f->file_name, flags, 0600);
 	} else {
-		if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
-			td_verror(td, errno, "madvise");
-			return 1;
-		}
-	}
+		if (f->filetype == FIO_TYPE_CHAR)
+			flags |= O_RDWR;
+		else
+			flags |= O_RDONLY;
 
-	return 0;
-}
+		f->fd = open(f->file_name, flags);
+	}
 
-static int setup_files_mmap(struct thread_data *td)
-{
-	struct fio_file *f;
-	int i, err = 0;
+	if (f->fd == -1) {
+		int __e = errno;
 
-	for_each_file(td, f, i) {
-		err = __setup_file_mmap(td, f);
-		if (err)
-			break;
+		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;
 	}
 
-	return err;
-}
+	if (get_file_size(td, f))
+		goto err;
 
-static int __setup_file_plain(struct thread_data *td, struct fio_file *f)
-{
 	if (td->invalidate_cache && file_invalidate_cache(td, f))
-		return 1;
+		goto err;
 
 	if (!td_random(td)) {
 		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
 			td_verror(td, errno, "fadvise");
-			return 1;
+			goto err;
 		}
 	} else {
 		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
 			td_verror(td, errno, "fadvise");
-			return 1;
+			goto err;
 		}
 	}
 
 	return 0;
+err:
+	close(f->fd);
+	return 1;
 }
 
-static int setup_files_plain(struct thread_data *td)
+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 = __setup_file_plain(td, f);
+		err = td_io_open_file(td, f);
 		if (err)
 			break;
-	}
-
-	return err;
-}
-
-static int setup_file(struct thread_data *td, struct fio_file *f)
-{
-	int flags = 0;
-
-	if (td->io_ops->flags & FIO_NETIO)
-		return 0;
-
-	/*
-	 * we need a valid file descriptor, but don't create a real file.
-	 * lets just dup stdout, seems like a sensible approach.
-	 */
-	if (td->io_ops->flags & FIO_NULLIO)
-		f->fd = dup(STDOUT_FILENO);
-	else {
-		if (td->odirect)
-			flags |= OS_O_DIRECT;
-		if (td->sync_io)
-			flags |= O_SYNC;
-
-		if (td_write(td) || td_rw(td)) {
-			flags |= O_RDWR;
-
-			if (td->filetype == FIO_TYPE_FILE) {
-				if (!td->overwrite)
-					flags |= O_TRUNC;
 
-				flags |= O_CREAT;
-			}
-
-			f->fd = open(f->file_name, flags, 0600);
-		} else {
-			if (td->filetype == FIO_TYPE_CHAR)
-				flags |= O_RDWR;
-			else
-				flags |= O_RDONLY;
-
-			f->fd = open(f->file_name, flags);
-		}
-	}
-
-	if (f->fd == -1) {
-		int __e = errno;
-
-		td_verror(td, __e, "open");
-		if (__e == EINVAL && td->odirect)
-			log_err("fio: destination does not support O_DIRECT\n");
-		return 1;
-	}
-
-	if (get_file_size(td, f))
-		return 1;
-
-	return 0;
-}
-
-int open_files(struct thread_data *td)
-{
-	struct fio_file *f;
-	int i, err = 0;
-
-	for_each_file(td, f, i) {
-		err = setup_file(td, f);
-		if (err)
+		if (td->open_files == td->nr_open_files)
 			break;
 	}
 
 	if (!err)
 		return 0;
 
-	for_each_file(td, f, i) {
-		if (f->fd != -1) {
-			close(f->fd);
-			f->fd = -1;
-		}
-	}
+	for_each_file(td, f, i)
+		td_io_close_file(td, f);
 
 	return err;
 }
@@ -425,7 +417,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
@@ -460,17 +453,8 @@ int setup_files(struct thread_data *td)
 
 	td->total_io_size = td->io_size * td->loops;
 
-	if (td->io_ops->flags & FIO_MMAPIO)
-		err = setup_files_mmap(td);
-	else
-		err = setup_files_plain(td);
-
-	for_each_file(td, f, i) {
-		if (f->fd != -1) {
-			close(f->fd);
-			f->fd = -1;
-		}
-	}
+	for_each_file(td, f, i)
+		td_io_close_file(td, f);
 
 	return err;
 }
@@ -478,27 +462,135 @@ 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;
 		}
-		if (f->fd != -1) {
-			close(f->fd);
-			f->fd = -1;
-		}
-		if (f->mmap) {
-			munmap(f->mmap, f->file_size);
-			f->mmap = NULL;
-		}
+
+		td_io_close_file(td, f);
+
+		if (f->file_map)
+			free(f->file_map);
 	}
 
 	td->filename = NULL;
-	free(td->files);
 	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;
+
+		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);
+}