X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=a1633827fe8eca63017bb8a2d91b731dd9854b73;hp=3f9bdb8333f989057529652eee34f5a6a0378116;hb=17abbe89b8d3a4c7a4deab00a7cc98fbd215f1ef;hpb=f102706350093e60617cc271b128e56c57ab3ce7

diff --git a/filesetup.c b/filesetup.c
index 3f9bdb83..a1633827 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;
 
@@ -99,13 +104,9 @@ static int create_files(struct thread_data *td)
 	}
 
 	need_create = 0;
-	for_each_file(td, f, i) {
-		if (td->filetype == FIO_TYPE_FILE) {
-			f->file_size = td->total_file_size / td->nr_files;
+	if (td->filetype == FIO_TYPE_FILE)
+		for_each_file(td, f, i)
 			need_create += file_ok(td, f);
-		} else
-			td->total_file_size += f->file_size;
-	}
 
 	if (!need_create)
 		return 0;
@@ -118,8 +119,8 @@ static int create_files(struct thread_data *td)
 
 	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,
+				td->name, td->nr_uniq_files,
+				(td->total_file_size >> 20) / td->nr_uniq_files,
 				td->total_file_size >> 20);
 
 	err = 0;
@@ -348,7 +349,6 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
 	if (get_file_size(td, f))
 		return 1;
 
-	td->total_file_size += f->file_size;
 	return 0;
 }
 
@@ -377,6 +377,13 @@ int setup_files(struct thread_data *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);
@@ -402,8 +409,13 @@ void close_files(struct thread_data *td)
 
 	for_each_file(td, f, i) {
 		if (f->fd != -1) {
-			if (td->unlink && td->filetype == FIO_TYPE_FILE)
+			if (td->unlink && td->filetype == FIO_TYPE_FILE &&
+			    td->filename) {
 				unlink(f->file_name);
+				td->filename = NULL;
+			}
+			free(f->file_name);
+			f->file_name = NULL;
 			close(f->fd);
 			f->fd = -1;
 		}
@@ -412,4 +424,8 @@ void close_files(struct thread_data *td)
 			f->mmap = NULL;
 		}
 	}
+
+	free(td->files);
+	td->files = NULL;
+	td->nr_files = 0;
 }