X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=a5b84c215cf740a50611ca20e16dfb0eedf1a49e;hp=a1633827fe8eca63017bb8a2d91b731dd9854b73;hb=e3bab463d4397e3378d8c7437e31de8aaf861a4f;hpb=a00735e66f9ec42549da94eba3170e543b542904

diff --git a/filesetup.c b/filesetup.c
index a1633827..a5b84c21 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -15,12 +15,19 @@ 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;
 
-	if (stat(f->file_name, &st) == -1)
+	if (lstat(f->file_name, &st) == -1)
 		return 1;
-	else if (st.st_size < (off_t) f->file_size)
+
+	/*
+	 * if it's a special file, size is always ok for now
+	 */
+	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;
@@ -35,17 +42,17 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 
 	f->fd = open(f->file_name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
 	if (f->fd < 0) {
-		td_verror(td, errno);
+		td_verror(td, errno, "open");
 		return 1;
 	}
 
 	if (ftruncate(f->fd, f->file_size) == -1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "ftruncate");
 		goto err;
 	}
 
 	if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
-		td_verror(td, errno);
+		td_verror(td, errno, "posix_fallocate");
 		goto err;
 	}
 
@@ -65,9 +72,9 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 			continue;
 		} else {
 			if (r < 0)
-				td_verror(td, errno);
+				td_verror(td, errno, "write");
 			else
-				td_verror(td, EIO);
+				td_verror(td, EIO, "write");
 
 			break;
 		}
@@ -91,41 +98,61 @@ err:
 static int create_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err, need_create;
+	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;
 
 	/*
 	 * unless specifically asked for overwrite, let normal io extend it
 	 */
-	if (!td->overwrite) {
-		for_each_file(td, f, i)
-			f->file_size = td->total_file_size / td->nr_files;
-
+	can_extend = !td->overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
+	if (can_extend)
 		return 0;
-	}
 
 	need_create = 0;
-	if (td->filetype == FIO_TYPE_FILE)
-		for_each_file(td, f, i)
-			need_create += file_ok(td, f);
+	for_each_file(td, f, i) {
+		int file_there;
+
+		if (f->filetype != FIO_TYPE_FILE)
+			continue;
+
+		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);
+		td_verror(td, EINVAL, "file_size");
 		return 1;
 	}
 
 	temp_stall_ts = 1;
-	fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
+	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);
 
 	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;
@@ -142,7 +169,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
 	if (td->overwrite) {
 		if (fstat(f->fd, &st) == -1) {
-			td_verror(td, errno);
+			td_verror(td, errno, "fstat");
 			return 1;
 		}
 
@@ -150,9 +177,9 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 
 		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;
 
-	f->file_size -= f->file_offset;
 	return 0;
 }
 
@@ -163,7 +190,7 @@ static int bdev_size(struct thread_data *td, struct fio_file *f)
 
 	r = blockdev_size(f->fd, &bytes);
 	if (r) {
-		td_verror(td, r);
+		td_verror(td, r, "blockdev_size");
 		return 1;
 	}
 
@@ -183,9 +210,9 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (td->filetype == FIO_TYPE_FILE)
+	if (f->filetype == FIO_TYPE_FILE)
 		ret = file_size(td, f);
-	else if (td->filetype == FIO_TYPE_BD)
+	else if (f->filetype == FIO_TYPE_BD)
 		ret = bdev_size(td, f);
 	else
 		f->real_file_size = -1;
@@ -205,157 +232,122 @@ 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)
+	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) {
-		td_verror(td, errno);
+		td_verror(td, errno, "invalidate_cache");
 		return 1;
 	}
 
-	return 0;
+	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);
-		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->sequential) {
-		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno);
-			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);
-			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");
+		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->sequential) {
+	if (!td_random(td)) {
 		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno);
-			return 1;
+			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);
-			return 1;
+			td_verror(td, errno, "fadvise");
+			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->odirect)
-		flags |= OS_O_DIRECT;
-
-	if (td_write(td) || td_rw(td)) {
-		if (td->filetype == FIO_TYPE_FILE) {
-			if (!td->overwrite)
-				flags |= O_TRUNC;
-
-			flags |= O_CREAT;
-		}
-		if (td->sync_io)
-			flags |= O_SYNC;
-
-		flags |= O_RDWR;
-
-		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 (td->open_files == td->nr_open_files)
+			break;
 	}
 
-	if (f->fd == -1) {
-		td_verror(td, errno);
-		return 1;
-	}
+	if (!err)
+		return 0;
 
-	if (get_file_size(td, f))
-		return 1;
+	for_each_file(td, f, i)
+		td_io_close_file(td, f);
 
-	return 0;
+	return err;
 }
 
 int setup_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err;
+	unsigned int i;
+	int err;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
@@ -367,13 +359,7 @@ int setup_files(struct thread_data *td)
 	if (create_files(td))
 		return 1;
 
-	err = 0;
-	for_each_file(td, f, i) {
-		err = setup_file(td, f);
-		if (err)
-			break;
-	}
-
+	err = open_files(td);
 	if (err)
 		return err;
 
@@ -384,10 +370,12 @@ 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);
-		td_verror(td, EINVAL);
+		td_verror(td, EINVAL, "total_file_size");
 		return 1;
 	}
 
@@ -396,36 +384,84 @@ int setup_files(struct thread_data *td)
 
 	td->total_io_size = td->io_size * td->loops;
 
-	if (td->io_ops->flags & FIO_MMAPIO)
-		return setup_files_mmap(td);
-	else
-		return setup_files_plain(td);
+	for_each_file(td, f, i)
+		td_io_close_file(td, f);
+
+	return err;
 }
 
 void close_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i;
+	unsigned int i;
 
 	for_each_file(td, f, i) {
-		if (f->fd != -1) {
-			if (td->unlink && td->filetype == FIO_TYPE_FILE &&
-			    td->filename) {
-				unlink(f->file_name);
-				td->filename = NULL;
-			}
-			free(f->file_name);
+		if (!td->filename && (f->flags & FIO_FILE_UNLINK) &&
+		    f->filetype == FIO_TYPE_FILE) {
+			unlink(f->file_name);
 			f->file_name = NULL;
-			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)) {
+		if (S_ISBLK(sb.st_mode))
+			f->filetype = FIO_TYPE_BD;
+		else if (S_ISCHR(sb.st_mode))
+			f->filetype = FIO_TYPE_CHAR;
+	}
+}
+
+void add_file(struct thread_data *td, const char *fname)
+{
+	int cur_files = td->open_files;
+	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->open_files++;
+	td->nr_uniq_files = td->open_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 (td->io_ops->close_file)
+		td->io_ops->close_file(td, f);
+	td->nr_open_files--;
+	f->flags &= ~FIO_FILE_OPEN;
+}