X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=a14cd9503a68dbab9a656b78a3fd92726d46b07c;hp=d0e3ed212366c27c05d7e7618912f80508fdb907;hb=ee88470c001012d08ae37bfc31741a935be2e7a1;hpb=25205e975e6dce6079a4b94d656724011f1aabd0

diff --git a/filesetup.c b/filesetup.c
index d0e3ed21..a14cd950 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -44,12 +44,17 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 		goto err;
 	}
 
-	b = malloc(td->max_bs);
-	memset(b, 0, td->max_bs);
+	if (posix_fallocate(f->fd, 0, f->file_size) < 0) {
+		td_verror(td, errno);
+		goto err;
+	}
+
+	b = malloc(td->max_bs[DDIR_WRITE]);
+	memset(b, 0, td->max_bs[DDIR_WRITE]);
 
 	left = f->file_size;
 	while (left && !td->terminate) {
-		bs = td->max_bs;
+		bs = td->max_bs[DDIR_WRITE];
 		if (bs > left)
 			bs = left;
 
@@ -88,15 +93,22 @@ static int create_files(struct thread_data *td)
 	struct fio_file *f;
 	int i, err, need_create;
 
+	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) {
+	if (!td->overwrite)
+		return 0;
+
+	need_create = 0;
+	if (td->filetype == FIO_TYPE_FILE)
 		for_each_file(td, f, i)
-			f->file_size = td->total_file_size / td->nr_files;
+			need_create += file_ok(td, f);
 
+	if (!need_create)
 		return 0;
-	}
 
 	if (!td->total_file_size) {
 		log_err("Need size for create\n");
@@ -104,26 +116,20 @@ static int create_files(struct thread_data *td)
 		return 1;
 	}
 
-	need_create = 0;
-	for_each_file(td, f, i) {
-		f->file_size = td->total_file_size / td->nr_files;
-		need_create += file_ok(td, f);
-	}
-
-	td->io_size = td->total_file_size;
-
-	if (!need_create)
-		return 0;
-
 	temp_stall_ts = 1;
-	fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
-				td->name, td->nr_files,
-				(td->total_file_size >> 20) / td->nr_files,
+	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->unlink = 0;
 		if (file_ok(td, f)) {
+			f->unlink = td->unlink;
 			err = create_file(td, f);
 			if (err)
 				break;
@@ -150,7 +156,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 			f->file_size = f->real_file_size;
 	}
 
-	f->file_size -= f->file_offset;
+	f->file_size = f->real_file_size - f->file_offset;
 	return 0;
 }
 
@@ -316,18 +322,18 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 
 	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;
 		}
-		if (td->sync_io)
-			flags |= O_SYNC;
-
-		flags |= O_RDWR;
 
 		f->fd = open(f->file_name, flags, 0600);
 	} else {
@@ -350,10 +356,34 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 	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)
+			break;
+	}
+
+	if (!err)
+		return 0;
+
+	for_each_file(td, f, i) {
+		if (f->fd != -1) {
+			close(f->fd);
+			f->fd = -1;
+		}
+	}
+
+	return err;
+}
+
 int setup_files(struct thread_data *td)
 {
 	struct fio_file *f;
-	int i, err;
+	int err, i;
 
 	/*
 	 * if ioengine defines a setup() method, it's responsible for
@@ -365,12 +395,18 @@ int setup_files(struct thread_data *td)
 	if (create_files(td))
 		return 1;
 
-	for_each_file(td, f, i) {
-		err = setup_file(td, f);
-		if (err)
-			break;
-	}
+	err = open_files(td);
+	if (err)
+		return err;
+
+	/*
+	 * Recalculate the total file size now that files are set up.
+	 */
+	td->total_file_size = 0;
+	for_each_file(td, f, i)
+		td->total_file_size += f->file_size;
 
+	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);
@@ -383,9 +419,18 @@ 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);
+		err = setup_files_mmap(td);
 	else
-		return setup_files_plain(td);
+		err = setup_files_plain(td);
+
+	for_each_file(td, f, i) {
+		if (f->fd != -1) {
+			close(f->fd);
+			f->fd = -1;
+		}
+	}
+
+	return err;
 }
 
 void close_files(struct thread_data *td)
@@ -394,9 +439,13 @@ void close_files(struct thread_data *td)
 	int i;
 
 	for_each_file(td, f, i) {
+		if (!td->filename && f->unlink &&
+		    td->filetype == FIO_TYPE_FILE) {
+			unlink(f->file_name);
+			free(f->file_name);
+			f->file_name = NULL;
+		}
 		if (f->fd != -1) {
-			if (td->unlink && td->filetype == FIO_TYPE_FILE)
-				unlink(f->file_name);
 			close(f->fd);
 			f->fd = -1;
 		}
@@ -405,4 +454,9 @@ void close_files(struct thread_data *td)
 			f->mmap = NULL;
 		}
 	}
+
+	td->filename = NULL;
+	free(td->files);
+	td->files = NULL;
+	td->nr_files = 0;
 }