X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=filesetup.c;h=6c0af85c545748c75cd2215b7befe711a1748f28;hb=b3d62a759a58bfce1822787874ea6ec8d2a0cb7f;hp=3b3f8684366ea6321915e4861bcce981dc2d8fcf;hpb=2dc1bbeb58edc85f2829eed6729862c438ea2353;p=fio.git

diff --git a/filesetup.c b/filesetup.c
index 3b3f8684..6c0af85c 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -119,6 +119,28 @@ static unsigned long long set_rand_file_size(struct thread_data *td,
 	return ret;
 }
 
+static int fill_file_size(struct thread_data *td, struct fio_file *f,
+			  unsigned long long *file_size, int new_files)
+{
+	if (!td->o.file_size_low) {
+		f->file_size = *file_size / new_files;
+		f->real_file_size = f->file_size;
+	} else {
+		/*
+		 * If we don't have enough space left for a file
+		 * of the minimum size, bail.
+		 */
+		if (*file_size < td->o.file_size_low)
+			return 1;
+
+		f->file_size = set_rand_file_size(td, *file_size);
+		f->real_file_size = f->file_size;
+		*file_size -= f->file_size;
+	}
+
+	return 0;
+}
+
 static int create_files(struct thread_data *td)
 {
 	struct fio_file *f;
@@ -135,8 +157,14 @@ static int create_files(struct thread_data *td)
 
 		if (f->filetype != FIO_TYPE_FILE)
 			continue;
+		if (!total_file_size)
+			continue;
 
 		if (f->flags & FIO_FILE_EXISTS) {
+			if ((f->file_size > td->o.size / td->o.nr_files) ||
+			    !f->file_size)
+				f->file_size = td->o.size / td->o.nr_files;
+
 			s = f->file_size;
 			if (s > total_file_size)
 				s = total_file_size;
@@ -150,8 +178,17 @@ static int create_files(struct thread_data *td)
 	 * unless specifically asked for overwrite, let normal io extend it
 	 */
 	can_extend = !td->o.overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
-	if (can_extend)
+	if (can_extend) {
+		for_each_file(td, f, i) {
+			if (fill_file_size(td, f, &total_file_size, new_files)) {
+				log_info("fio: limited to %d files\n", i);
+				td->o.nr_files = i;
+				break;
+			}
+		}
+
 		return 0;
+	}
 
 	local_file_size = total_file_size;
 	if (!local_file_size)
@@ -170,22 +207,11 @@ static int create_files(struct thread_data *td)
 			continue;
 		}
 
-		if (!td->o.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->o.file_size_low) {
-				log_info("fio: limited to %d files\n", i);
-				new_files -= (td->o.nr_files - i);
-				td->o.nr_files = i;
-				break;
-			}
-
-			f->file_size = set_rand_file_size(td, local_file_size);
-			local_file_size -= f->file_size;
+		if (fill_file_size(td, f, &local_file_size, new_files)) {
+			log_info("fio: limited to %d files\n", i);
+			new_files -= (td->o.nr_files - i);
+			td->o.nr_files = i;
+			break;
 		}
 
 		total_file_size += f->file_size;
@@ -461,6 +487,30 @@ int setup_files(struct thread_data *td)
 	return err;
 }
 
+int init_random_map(struct thread_data *td)
+{
+	int num_maps, blocks;
+	struct fio_file *f;
+	unsigned int i;
+
+	if (td->o.norandommap)
+		return 0;
+
+	for_each_file(td, f, i) {
+		blocks = (f->real_file_size + td->o.rw_min_bs - 1) / td->o.rw_min_bs;
+		num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
+		f->file_map = malloc(num_maps * sizeof(long));
+		if (!f->file_map) {
+			log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+			return 1;
+		}
+		f->num_maps = num_maps;
+		memset(f->file_map, 0, num_maps * sizeof(long));
+	}
+
+	return 0;
+}
+
 void close_files(struct thread_data *td)
 {
 	struct fio_file *f;
@@ -476,8 +526,10 @@ void close_files(struct thread_data *td)
 
 		td_io_close_file(td, f);
 
-		if (f->file_map)
+		if (f->file_map) {
 			free(f->file_map);
+			f->file_map = NULL;
+		}
 	}
 
 	td->o.filename = NULL;