X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=b356b447ddaeadffa01f4d551ea868621cff3220;hp=053bda9d70f684e6d6fac6eba093f806e87fb51d;hb=2b386d2569c9078ca9790c4e6d318ec3835b8739;hpb=9c60ce649d3f976d196709d4399bb7c540ce97b5

diff --git a/filesetup.c b/filesetup.c
index 053bda9d..b356b447 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,62 +8,76 @@
 #include <sys/types.h>
 
 #include "fio.h"
-#include "os.h"
+#include "smalloc.h"
+#include "filehash.h"
 
-/*
- * Check if the file exists and it's large enough.
- */
-static int file_ok(struct thread_data *td, struct fio_file *f)
+static int root_warn;
+
+static int extend_file(struct thread_data *td, struct fio_file *f)
 {
-	struct stat st;
+	int r, new_layout = 0, unlink_file = 0, flags;
+	unsigned long long left;
+	unsigned int bs;
+	char *b;
 
-	if (f->filetype != FIO_TYPE_FILE ||
-	    (td->io_ops->flags & FIO_DISKLESSIO))
+	if (read_only) {
+		log_err("fio: refusing extend of file due to read-only\n");
 		return 0;
-
-	if (lstat(f->file_name, &st) == -1)
-		return 1;
+	}
 
 	/*
-	 * if it's a special file, size is always ok for now
+	 * check if we need to lay the file out complete again. fio
+	 * does that for operations involving reads, or for writes
+	 * where overwrite is set
 	 */
-	if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))
-		return 0;
-	if (st.st_size < (off_t) f->file_size)
-		return 1;
-
-	return 0;
-}
+	if (td_read(td) || (td_write(td) && td->o.overwrite) ||
+	    (td_write(td) && td->io_ops->flags & FIO_NOEXTEND))
+		new_layout = 1;
+	if (td_write(td) && !td->o.overwrite)
+		unlink_file = 1;
+
+	if (unlink_file || new_layout) {
+		dprint(FD_FILE, "layout unlink %s\n", f->file_name);
+		if ((unlink(f->file_name) < 0) && (errno != ENOENT)) {
+			td_verror(td, errno, "unlink");
+			return 1;
+		}
+	}
 
-static int create_file(struct thread_data *td, struct fio_file *f)
-{
-	unsigned long long left;
-	unsigned int bs;
-	char *b;
-	int r;
+	flags = O_WRONLY | O_CREAT;
+	if (new_layout)
+		flags |= O_TRUNC;
 
-	f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	dprint(FD_FILE, "open file %s, flags %x\n", f->file_name, flags);
+	f->fd = open(f->file_name, flags, 0644);
 	if (f->fd < 0) {
 		td_verror(td, errno, "open");
 		return 1;
 	}
 
-	if (ftruncate(f->fd, f->file_size) == -1) {
+	if (!new_layout)
+		goto done;
+
+	dprint(FD_FILE, "truncate file %s, size %llu\n", f->file_name,
+							f->real_file_size);
+	if (ftruncate(f->fd, f->real_file_size) == -1) {
 		td_verror(td, errno, "ftruncate");
 		goto err;
 	}
 
-	if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
+	dprint(FD_FILE, "fallocate file %s, size %llu\n", f->file_name,
+							f->real_file_size);
+	if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
 		td_verror(td, errno, "posix_fallocate");
 		goto err;
 	}
 
-	b = malloc(td->max_bs[DDIR_WRITE]);
-	memset(b, 0, td->max_bs[DDIR_WRITE]);
+	b = malloc(td->o.max_bs[DDIR_WRITE]);
+	memset(b, 0, td->o.max_bs[DDIR_WRITE]);
 
-	left = f->file_size;
+	left = f->real_file_size;
 	while (left && !td->terminate) {
-		bs = td->max_bs[DDIR_WRITE];
+		bs = td->o.max_bs[DDIR_WRITE];
 		if (bs > left)
 			bs = left;
 
@@ -82,12 +96,18 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 		}
 	}
 
-	if (td->terminate)
+	if (td->terminate) {
+		dprint(FD_FILE, "terminate unlink %s\n", f->file_name);
 		unlink(f->file_name);
-	else if (td->create_fsync)
-		fsync(f->fd);
+	} else if (td->o.create_fsync) {
+		if (fsync(f->fd) < 0) {
+			td_verror(td, errno, "fsync");
+			goto err;
+		}
+	}
 
 	free(b);
+done:
 	close(f->fd);
 	f->fd = -1;
 	return 0;
@@ -97,154 +117,29 @@ err:
 	return 1;
 }
 
-static unsigned long long set_rand_file_size(struct thread_data *td,
-					     unsigned long long total_size)
+static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-	unsigned long long upper = total_size;
-	unsigned long long ret;
+	unsigned long long ret, size_d;
 	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;
+	size_d = td->o.file_size_high - td->o.file_size_low;
+	ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
+	ret += td->o.file_size_low;
+	ret -= (ret % td->o.rw_min_bs);
 	return ret;
 }
 
-static int create_files(struct thread_data *td)
-{
-	struct fio_file *f;
-	int err, need_create, can_extend;
-	unsigned long long total_file_size, local_file_size;
-	unsigned int i, new_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
-	 */
-	can_extend = !td->overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
-	if (can_extend)
-		return 0;
-
-	need_create = 0;
-	local_file_size = total_file_size;
-	if (!local_file_size)
-		local_file_size = -1;
-
-	for_each_file(td, f, i) {
-		int file_there;
-
-		if (f->filetype != FIO_TYPE_FILE)
-			continue;
-		if (f->flags & FIO_FILE_EXISTS)
-			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;
-			}
-
-			f->file_size = set_rand_file_size(td, local_file_size);
-			local_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)
-		return 0;
-
-	if (!td->total_file_size) {
-		log_err("Need size for create\n");
-		td_verror(td, EINVAL, "file_size");
-		return 1;
-	}
-
-	temp_stall_ts = 1;
-	fprintf(f_out, "%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->flags &= ~FIO_FILE_UNLINK;
-		if (file_ok(td, f)) {
-			if (td->unlink)
-				f->flags |= FIO_FILE_UNLINK;
-
-			err = create_file(td, f);
-			if (err)
-				break;
-		}
-	}
-
-	temp_stall_ts = 0;
-	return err;
-}
-
 static int file_size(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	if (td->overwrite) {
-		if (fstat(f->fd, &st) == -1) {
-			td_verror(td, errno, "fstat");
-			return 1;
-		}
-
-		f->real_file_size = st.st_size;
-
-		if (!f->file_size || f->file_size > f->real_file_size)
-			f->file_size = f->real_file_size;
-	} else
-		f->real_file_size = f->file_size;
+	if (fstat(f->fd, &st) == -1) {
+		td_verror(td, errno, "fstat");
+		return 1;
+	}
 
+	f->real_file_size = st.st_size;
 	return 0;
 }
 
@@ -260,14 +155,6 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
 	}
 
 	f->real_file_size = bytes;
-
-	/*
-	 * no extend possibilities, so limit size to device size if too large
-	 */
-	if (!f->file_size || f->file_size > f->real_file_size)
-		f->file_size = f->real_file_size;
-
-	f->file_size -= f->file_offset;
 	return 0;
 }
 
@@ -275,10 +162,12 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (f->filetype == FIO_TYPE_FILE) {
-		if (!(f->flags & FIO_FILE_EXISTS))
-			ret = file_size(td, f);
-	} else if (f->filetype == FIO_TYPE_BD)
+	if (f->flags & FIO_SIZE_KNOWN)
+		return 0;
+
+	if (f->filetype == FIO_TYPE_FILE)
+		ret = file_size(td, f);
+	else if (f->filetype == FIO_TYPE_BD)
 		ret = bdev_size(td, f);
 	else
 		f->real_file_size = -1;
@@ -287,10 +176,12 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 		return ret;
 
 	if (f->file_offset > f->real_file_size) {
-		log_err("%s: offset extends end (%Lu > %Lu)\n", td->name, f->file_offset, f->real_file_size);
+		log_err("%s: offset extends end (%Lu > %Lu)\n", td->o.name,
+					f->file_offset, f->real_file_size);
 		return 1;
 	}
 
+	f->flags |= FIO_SIZE_KNOWN;
 	return 0;
 }
 
@@ -298,19 +189,30 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (td->odirect)
+	dprint(FD_IO, "invalidate cache (%d)\n", td->o.odirect);
+
+	if (td->o.odirect)
 		return 0;
 
 	/*
 	 * FIXME: add blockdev flushing too
 	 */
 	if (f->mmap)
-		ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
+		ret = madvise(f->mmap, f->io_size, MADV_DONTNEED);
 	else if (f->filetype == FIO_TYPE_FILE) {
-		ret = fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_DONTNEED);
+		ret = fadvise(f->fd, f->file_offset, f->io_size,
+						POSIX_FADV_DONTNEED);
 	} else if (f->filetype == FIO_TYPE_BD) {
 		ret = blockdev_invalidate_cache(f->fd);
-	} else if (f->filetype == FIO_TYPE_CHAR)
+		if (ret < 0 && errno == EACCES && geteuid()) {
+			if (!root_warn) {
+				log_err("fio: only root may flush block "
+					"devices. Cache flush bypassed!\n");
+				root_warn = 1;
+			}
+			ret = 0;
+		}
+	} else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE)
 		ret = 0;
 
 	if (ret < 0) {
@@ -321,63 +223,125 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	return ret;
 }
 
-void generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
+int generic_close_file(struct thread_data fio_unused *td, struct fio_file *f)
 {
-	close(f->fd);
+	int ret = 0;
+
+	dprint(FD_FILE, "fd close %s\n", f->file_name);
+
+	remove_file_hash(f);
+
+	if (close(f->fd) < 0)
+		ret = errno;
+
 	f->fd = -1;
+	return ret;
+}
+
+static int file_lookup_open(struct fio_file *f, int flags)
+{
+	struct fio_file *__f;
+	int from_hash;
+
+	__f = lookup_file_hash(f->file_name);
+	if (__f) {
+		dprint(FD_FILE, "found file in hash %s\n", f->file_name);
+		/*
+		 * racy, need the __f->lock locked
+		 */
+		f->lock = __f->lock;
+		f->lock_owner = __f->lock_owner;
+		f->lock_batch = __f->lock_batch;
+		f->lock_ddir = __f->lock_ddir;
+		from_hash = 1;
+	} else {
+		dprint(FD_FILE, "file not found in hash %s\n", f->file_name);
+		from_hash = 0;
+	}
+
+	f->fd = open(f->file_name, flags, 0600);
+	return from_hash;
 }
 
 int generic_open_file(struct thread_data *td, struct fio_file *f)
 {
+	int is_std = 0;
 	int flags = 0;
+	int from_hash = 0;
+
+	dprint(FD_FILE, "fd open %s\n", f->file_name);
+
+	if (!strcmp(f->file_name, "-")) {
+		if (td_rw(td)) {
+			log_err("fio: can't read/write to stdin/out\n");
+			return 1;
+		}
+		is_std = 1;
 
-	if (td->odirect)
+		/*
+		 * move output logging to stderr, if we are writing to stdout
+		 */
+		if (td_write(td))
+			f_out = stderr;
+	}
+
+	if (td->o.odirect)
 		flags |= OS_O_DIRECT;
-	if (td->sync_io)
+	if (td->o.sync_io)
 		flags |= O_SYNC;
+	if (f->filetype != FIO_TYPE_FILE)
+		flags |= O_NOATIME;
 
-	if (td_write(td) || td_rw(td)) {
-		flags |= O_RDWR;
+open_again:
+	if (td_write(td)) {
+		if (!read_only)
+			flags |= O_RDWR;
 
 		if (f->filetype == FIO_TYPE_FILE)
 			flags |= O_CREAT;
 
-		f->fd = open(f->file_name, flags, 0600);
+		if (is_std)
+			f->fd = dup(STDOUT_FILENO);
+		else
+			from_hash = file_lookup_open(f, flags);
 	} else {
-		if (f->filetype == FIO_TYPE_CHAR)
+		if (f->filetype == FIO_TYPE_CHAR && !read_only)
 			flags |= O_RDWR;
 		else
 			flags |= O_RDONLY;
 
-		f->fd = open(f->file_name, flags);
+		if (is_std)
+			f->fd = dup(STDIN_FILENO);
+		else
+			from_hash = file_lookup_open(f, flags);
 	}
 
 	if (f->fd == -1) {
+		char buf[FIO_VERROR_SIZE];
 		int __e = errno;
 
-		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;
+		if (errno == EPERM && (flags & O_NOATIME)) {
+			flags &= ~O_NOATIME;
+			goto open_again;
+		}
+
+		snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
+
+		td_verror(td, __e, buf);
 	}
 
 	if (get_file_size(td, f))
 		goto err;
 
-	if (td->invalidate_cache && file_invalidate_cache(td, f))
-		goto err;
+	if (!from_hash && f->fd != -1) {
+		if (add_file_hash(f)) {
+			int ret;
 
-	if (!td_random(td)) {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno, "fadvise");
-			goto err;
-		}
-	} else {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
-			td_verror(td, errno, "fadvise");
-			goto err;
+			/*
+			 * OK to ignore, we haven't done anything with it
+			 */
+			ret = generic_close_file(td, f);
+			goto open_again;
 		}
 	}
 
@@ -393,12 +357,22 @@ int open_files(struct thread_data *td)
 	unsigned int i;
 	int err = 0;
 
+	dprint(FD_FILE, "open files\n");
+
 	for_each_file(td, f, i) {
 		err = td_io_open_file(td, f);
-		if (err)
+		if (err) {
+			if (td->error == EMFILE) {
+				log_err("fio: limited open files to: %d\n",
+							td->nr_open_files);
+				td->o.open_files = td->nr_open_files;
+				err = 0;
+				clear_error(td);
+			}
 			break;
+		}
 
-		if (td->open_files == td->nr_open_files)
+		if (td->o.open_files == td->nr_open_files)
 			break;
 	}
 
@@ -411,49 +385,214 @@ int open_files(struct thread_data *td)
 	return err;
 }
 
+/*
+ * open/close all files, so that ->real_file_size gets set
+ */
+static int get_file_sizes(struct thread_data *td)
+{
+	struct fio_file *f;
+	unsigned int i;
+	int err = 0;
+
+	for_each_file(td, f, i) {
+		dprint(FD_FILE, "get file size for %p/%d/%p\n", f, i,
+								f->file_name);
+
+		if (td->io_ops->open_file(td, f)) {
+			if (td->error != ENOENT) {
+				log_err("%s\n", td->verror);
+				err = 1;
+			}
+			clear_error(td);
+		} else {
+			if (td->io_ops->close_file)
+				td->io_ops->close_file(td, f);
+		}
+
+		if (f->real_file_size == -1ULL && td->o.size)
+			f->real_file_size = td->o.size / td->o.nr_files;
+	}
+
+	return err;
+}
+
+/*
+ * Open the files and setup files sizes, creating files if necessary.
+ */
 int setup_files(struct thread_data *td)
 {
+	unsigned long long total_size, extend_size;
 	struct fio_file *f;
 	unsigned int i;
-	int err;
+	int err = 0, need_extend;
+
+	dprint(FD_FILE, "setup files\n");
+
+	if (td->o.read_iolog_file)
+		return 0;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
-	 * setting up everything in the td->files[] area.
+	 * opening the files and setting f->real_file_size to indicate
+	 * the valid range for that file.
 	 */
 	if (td->io_ops->setup)
-		return td->io_ops->setup(td);
-
-	if (create_files(td))
-		return 1;
+		err = td->io_ops->setup(td);
+	else
+		err = get_file_sizes(td);
 
-	err = open_files(td);
 	if (err)
 		return err;
 
 	/*
-	 * Recalculate the total file size now that files are set up.
+	 * check sizes. if the files/devices do not exist and the size
+	 * isn't passed to fio, abort.
 	 */
-	td->total_file_size = 0;
-	for_each_file(td, f, i)
-		td->total_file_size += f->file_size;
+	total_size = 0;
+	for_each_file(td, f, i) {
+		if (f->real_file_size == -1ULL)
+			total_size = -1ULL;
+		else
+			total_size += f->real_file_size;
+	}
 
-	td->io_size = td->total_file_size;
-	if (td->io_size == 0) {
-		log_err("%s: no io blocks\n", td->name);
+	/*
+	 * device/file sizes are zero and no size given, punt
+	 */
+	if ((!total_size || total_size == -1ULL) && !td->o.size &&
+	    !(td->io_ops->flags & FIO_NOIO) && !td->o.fill_device) {
+		log_err("%s: you need to specify size=\n", td->o.name);
 		td_verror(td, EINVAL, "total_file_size");
 		return 1;
 	}
 
-	if (!td->zone_size)
-		td->zone_size = td->io_size;
+	/*
+	 * now file sizes are known, so we can set ->io_size. if size= is
+	 * not given, ->io_size is just equal to ->real_file_size. if size
+	 * is given, ->io_size is size / nr_files.
+	 */
+	extend_size = total_size = 0;
+	need_extend = 0;
+	for_each_file(td, f, i) {
+		f->file_offset = td->o.start_offset;
+
+		if (!td->o.file_size_low) {
+			/*
+			 * no file size range given, file size is equal to
+			 * total size divided by number of files. if that is
+			 * zero, set it to the real file size.
+			 */
+			f->io_size = td->o.size / td->o.nr_files;
+			if (!f->io_size)
+				f->io_size = f->real_file_size - f->file_offset;
+		} else if (f->real_file_size < td->o.file_size_low ||
+			   f->real_file_size > td->o.file_size_high) {
+			if (f->file_offset > td->o.file_size_low)
+				goto err_offset;
+			/*
+			 * file size given. if it's fixed, use that. if it's a
+			 * range, generate a random size in-between.
+			 */
+			if (td->o.file_size_low == td->o.file_size_high) {
+				f->io_size = td->o.file_size_low
+						- f->file_offset;
+			} else {
+				f->io_size = get_rand_file_size(td)
+						- f->file_offset;
+			}
+		} else
+			f->io_size = f->real_file_size - f->file_offset;
+
+		if (f->io_size == -1ULL)
+			total_size = -1ULL;
+		else
+			total_size += f->io_size;
+
+		if (f->filetype == FIO_TYPE_FILE &&
+		    (f->io_size + f->file_offset) > f->real_file_size &&
+		    !(td->io_ops->flags & FIO_DISKLESSIO)) {
+			need_extend++;
+			extend_size += (f->io_size + f->file_offset);
+			f->flags |= FIO_FILE_EXTEND;
+		}
+	}
+
+	if (!td->o.size || td->o.size > total_size)
+		td->o.size = total_size;
 
-	td->total_io_size = td->io_size * td->loops;
+	/*
+	 * See if we need to extend some files
+	 */
+	if (need_extend) {
+		temp_stall_ts = 1;
+		log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
+			td->o.name, need_extend, extend_size >> 20);
+
+		for_each_file(td, f, i) {
+			if (!(f->flags & FIO_FILE_EXTEND))
+				continue;
+
+			assert(f->filetype == FIO_TYPE_FILE);
+			f->flags &= ~FIO_FILE_EXTEND;
+			f->real_file_size = (f->io_size + f->file_offset);
+			err = extend_file(td, f);
+			if (err)
+				break;
+		}
+		temp_stall_ts = 0;
+	}
 
-	for_each_file(td, f, i)
-		td_io_close_file(td, f);
+	if (err)
+		return err;
 
-	return err;
+	if (!td->o.zone_size)
+		td->o.zone_size = td->o.size;
+
+	/*
+	 * iolog already set the total io size, if we read back
+	 * stored entries.
+	 */
+	if (!td->o.read_iolog_file)
+		td->total_io_size = td->o.size * td->o.loops;
+	return 0;
+err_offset:
+	log_err("%s: you need to specify valid offset=\n", td->o.name);
+	return 1;
+}
+
+int init_random_map(struct thread_data *td)
+{
+	unsigned long long blocks, num_maps;
+	struct fio_file *f;
+	unsigned int i;
+
+	if (td->o.norandommap || !td_random(td))
+		return 0;
+
+	for_each_file(td, f, i) {
+		blocks = (f->real_file_size + td->o.rw_min_bs - 1) /
+				(unsigned long long) td->o.rw_min_bs;
+		num_maps = (blocks + BLOCKS_PER_MAP - 1) /
+				(unsigned long long) BLOCKS_PER_MAP;
+		f->file_map = smalloc(num_maps * sizeof(long));
+		if (f->file_map) {
+			f->num_maps = num_maps;
+			continue;
+		}
+		if (!td->o.softrandommap) {
+			log_err("fio: failed allocating random map. If running"
+				" a large number of jobs, try the 'norandommap'"
+				" option or set 'softrandommap'. Or give"
+				" a larger --alloc-size to fio.\n");
+			return 1;
+		}
+
+		log_info("fio: file %s failed allocating random map. Running "
+			 "job without.\n", f->file_name);
+		f->num_maps = 0;
+	}
+
+	return 0;
 }
 
 void close_files(struct thread_data *td)
@@ -461,88 +600,206 @@ void close_files(struct thread_data *td)
 	struct fio_file *f;
 	unsigned int i;
 
+	for_each_file(td, f, i)
+		td_io_close_file(td, f);
+}
+
+void close_and_free_files(struct thread_data *td)
+{
+	struct fio_file *f;
+	unsigned int i;
+
+	dprint(FD_FILE, "close files\n");
+
 	for_each_file(td, f, i) {
-		if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
-		    f->filetype == FIO_TYPE_FILE) {
+		if (td->o.unlink && f->filetype == FIO_TYPE_FILE) {
+			dprint(FD_FILE, "free unlink %s\n", f->file_name);
 			unlink(f->file_name);
-			free(f->file_name);
-			f->file_name = NULL;
 		}
 
 		td_io_close_file(td, f);
 
-		if (f->file_map)
-			free(f->file_map);
+		sfree(f->file_name);
+		f->file_name = NULL;
+
+		if (f->file_map) {
+			sfree(f->file_map);
+			f->file_map = NULL;
+		}
+		sfree(f);
 	}
 
-	td->filename = NULL;
+	td->o.filename = NULL;
+	free(td->files);
+	td->files_index = 0;
 	td->files = NULL;
-	td->nr_files = 0;
+	td->o.nr_files = 0;
 }
 
 static void get_file_type(struct fio_file *f)
 {
 	struct stat sb;
 
-	f->filetype = FIO_TYPE_FILE;
+	if (!strcmp(f->file_name, "-"))
+		f->filetype = FIO_TYPE_PIPE;
+	else
+		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;
-		}
+		else if (S_ISFIFO(sb.st_mode))
+			f->filetype = FIO_TYPE_PIPE;
 	}
 }
 
-void add_file(struct thread_data *td, const char *fname)
+int add_file(struct thread_data *td, const char *fname)
 {
 	int cur_files = td->files_index;
+	char file_name[PATH_MAX];
 	struct fio_file *f;
+	int len = 0;
 
-	td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
+	dprint(FD_FILE, "add file %s\n", fname);
 
-	f = &td->files[cur_files];
-	memset(f, 0, sizeof(*f));
+	f = smalloc(sizeof(*f));
 	f->fd = -1;
-	f->file_name = strdup(fname);
+
+	dprint(FD_FILE, "resize file array to %d files\n", cur_files + 1);
+
+	td->files = realloc(td->files, (cur_files + 1) * sizeof(f));
+	td->files[cur_files] = f;
+
+	/*
+	 * init function, io engine may not be loaded yet
+	 */
+	if (td->io_ops && (td->io_ops->flags & FIO_DISKLESSIO))
+		f->real_file_size = -1ULL;
+
+	if (td->o.directory)
+		len = sprintf(file_name, "%s/", td->o.directory);
+
+	sprintf(file_name + len, "%s", fname);
+	f->file_name = smalloc_strdup(file_name);
 
 	get_file_type(f);
 
+	switch (td->o.file_lock_mode) {
+	case FILE_LOCK_NONE:
+		break;
+	case FILE_LOCK_READWRITE:
+		f->lock = fio_mutex_rw_init();
+		break;
+	case FILE_LOCK_EXCLUSIVE:
+		f->lock = fio_mutex_init(1);
+		break;
+	default:
+		log_err("fio: unknown lock mode: %d\n", td->o.file_lock_mode);
+		assert(0);
+	}
+
 	td->files_index++;
 	if (f->filetype == FIO_TYPE_FILE)
 		td->nr_normal_files++;
+
+	dprint(FD_FILE, "file %p \"%s\" added at %d\n", f, f->file_name,
+							cur_files);
+
+	return cur_files;
 }
 
 void get_file(struct fio_file *f)
 {
+	dprint(FD_FILE, "get file %s, ref=%d\n", f->file_name, f->references);
+	assert(f->flags & FIO_FILE_OPEN);
 	f->references++;
 }
 
-void put_file(struct thread_data *td, struct fio_file *f)
+int put_file(struct thread_data *td, struct fio_file *f)
 {
+	int f_ret = 0, ret = 0;
+
+	dprint(FD_FILE, "put file %s, ref=%d\n", f->file_name, f->references);
+
 	if (!(f->flags & FIO_FILE_OPEN))
-		return;
+		return 0;
 
 	assert(f->references);
 	if (--f->references)
-		return;
+		return 0;
 
-	if (should_fsync(td) && td->fsync_on_close)
-		fsync(f->fd);
+	if (should_fsync(td) && td->o.fsync_on_close)
+		f_ret = fsync(f->fd);
 
 	if (td->io_ops->close_file)
-		td->io_ops->close_file(td, f);
+		ret = td->io_ops->close_file(td, f);
+
+	if (!ret)
+		ret = !f_ret;
+
 	td->nr_open_files--;
 	f->flags &= ~FIO_FILE_OPEN;
+	return ret;
+}
+
+void lock_file(struct thread_data *td, struct fio_file *f, enum fio_ddir ddir)
+{
+	if (!f->lock || td->o.file_lock_mode == FILE_LOCK_NONE)
+		return;
+
+	if (f->lock_owner == td && f->lock_batch--)
+		return;
+
+	if (td->o.file_lock_mode == FILE_LOCK_READWRITE) {
+		if (ddir == DDIR_READ)
+			fio_mutex_down_read(f->lock);
+		else
+			fio_mutex_down_write(f->lock);
+	} else if (td->o.file_lock_mode == FILE_LOCK_EXCLUSIVE)
+		fio_mutex_down(f->lock);
+
+	f->lock_owner = td;
+	f->lock_batch = td->o.lockfile_batch;
+	f->lock_ddir = ddir;
+}
+
+void unlock_file(struct thread_data *td, struct fio_file *f)
+{
+	if (!f->lock || td->o.file_lock_mode == FILE_LOCK_NONE)
+		return;
+	if (f->lock_batch)
+		return;
+
+	if (td->o.file_lock_mode == FILE_LOCK_READWRITE) {
+		const int is_read = f->lock_ddir == DDIR_READ;
+		int val = fio_mutex_getval(f->lock);
+
+		if ((is_read && val == 1) || (!is_read && val == -1))
+			f->lock_owner = NULL;
+
+		if (is_read)
+			fio_mutex_up_read(f->lock);
+		else
+			fio_mutex_up_write(f->lock);
+	} else if (td->o.file_lock_mode == FILE_LOCK_EXCLUSIVE) {
+		int val = fio_mutex_getval(f->lock);
+
+		if (val == 0)
+			f->lock_owner = NULL;
+
+		fio_mutex_up(f->lock);
+	}
+}
+
+void unlock_file_all(struct thread_data *td, struct fio_file *f)
+{
+	if (f->lock_owner != td)
+		return;
+
+	f->lock_batch = 0;
+	unlock_file(td, f);
 }
 
 static int recurse_dir(struct thread_data *td, const char *dirname)
@@ -553,7 +810,10 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
 	D = opendir(dirname);
 	if (!D) {
-		td_verror(td, errno, "opendir");
+		char buf[FIO_VERROR_SIZE];
+
+		snprintf(buf, FIO_VERROR_SIZE - 1, "opendir(%s)", dirname);
+		td_verror(td, errno, buf);
 		return 1;
 	}
 
@@ -575,11 +835,14 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
 		if (S_ISREG(sb.st_mode)) {
 			add_file(td, full_path);
-			td->nr_files++;
+			td->o.nr_files++;
 			continue;
 		}
+		if (!S_ISDIR(sb.st_mode))
+			continue;
 
-		if ((ret = recurse_dir(td, full_path)) != 0)
+		ret = recurse_dir(td, full_path);
+		if (ret)
 			break;
 	}
 
@@ -589,5 +852,59 @@ static int recurse_dir(struct thread_data *td, const char *dirname)
 
 int add_dir_files(struct thread_data *td, const char *path)
 {
-	return recurse_dir(td, path);
+	int ret = recurse_dir(td, path);
+
+	if (!ret)
+		log_info("fio: opendir added %d files\n", td->o.nr_files);
+
+	return ret;
+}
+
+void dup_files(struct thread_data *td, struct thread_data *org)
+{
+	struct fio_file *f;
+	unsigned int i;
+
+	dprint(FD_FILE, "dup files: %d\n", org->files_index);
+
+	if (!org->files)
+		return;
+
+	td->files = malloc(org->files_index * sizeof(f));
+
+	for_each_file(org, f, i) {
+		struct fio_file *__f;
+
+		__f = smalloc(sizeof(*__f));
+
+		if (f->file_name)
+			__f->file_name = smalloc_strdup(f->file_name);
+
+		td->files[i] = __f;
+	}
+}
+
+/*
+ * Returns the index that matches the filename, or -1 if not there
+ */
+int get_fileno(struct thread_data *td, const char *fname)
+{
+	struct fio_file *f;
+	unsigned int i;
+
+	for_each_file(td, f, i)
+		if (!strcmp(f->file_name, fname))
+			return i;
+
+	return -1;
+}
+
+/*
+ * For log usage, where we add/open/close files automatically
+ */
+void free_release_files(struct thread_data *td)
+{
+	close_files(td);
+	td->files_index = 0;
+	td->nr_normal_files = 0;
 }