X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=fb9219199e31ca378a24b2662f246167abe6a3fe;hp=f43efe0d395162a70bdc9319c760909ed5b27585;hb=7e0e25c924d51f23196b3e0ea83b79178fc46823;hpb=808a63b8d2d5f6d3a4ec83e718495f09588aef7e

diff --git a/filesetup.c b/filesetup.c
index f43efe0d..fb921919 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -58,12 +58,12 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 		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;
 	while (left && !td->terminate) {
-		bs = td->max_bs[DDIR_WRITE];
+		bs = td->o.max_bs[DDIR_WRITE];
 		if (bs > left)
 			bs = left;
 
@@ -84,7 +84,7 @@ static int create_file(struct thread_data *td, struct fio_file *f)
 
 	if (td->terminate)
 		unlink(f->file_name);
-	else if (td->create_fsync)
+	else if (td->o.create_fsync)
 		fsync(f->fd);
 
 	free(b);
@@ -97,24 +97,78 @@ err:
 	return 1;
 }
 
+static unsigned long long set_rand_file_size(struct thread_data *td,
+					     unsigned long long total_size)
+{
+	unsigned long long upper = total_size;
+	unsigned long long ret;
+	long r;
+
+	if (upper > td->o.file_size_high)
+		upper = td->o.file_size_high;
+	else if (upper < td->o.file_size_low)
+		return 0;
+	else if (!upper)
+		return 0;
+
+	r = os_random_long(&td->file_size_state);
+	ret = td->o.file_size_low + (unsigned long long) ((double) upper * (r / (RAND_MAX + 1.0)));
+	ret -= (ret % td->o.rw_min_bs);
+	if (ret > upper)
+		ret = upper;
+	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;
 	int err, need_create, can_extend;
-	unsigned long long total_file_size;
+	unsigned long long total_file_size, local_file_size, create_size;
 	unsigned int i, new_files;
 
 	new_files = 0;
-	total_file_size = td->total_file_size;
+	total_file_size = td->o.size;
 	for_each_file(td, f, i) {
 		unsigned long long s;
 
-		f->file_offset = td->start_offset;
+		f->file_offset = td->o.start_offset;
 
-		if (f->filetype != FIO_TYPE_FILE)
+		if (!total_file_size)
 			continue;
 
+		if (f->filetype != FIO_TYPE_FILE) {
+			if (!f->file_size)
+				f->file_size = total_file_size / td->o.nr_files;
+			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;
@@ -127,24 +181,48 @@ static int create_files(struct thread_data *td)
 	/*
 	 * unless specifically asked for overwrite, let normal io extend it
 	 */
-	can_extend = !td->overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
-	if (can_extend)
+	can_extend = !td->o.overwrite && !(td->io_ops->flags & FIO_NOEXTEND);
+	if (can_extend && new_files) {
+		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)
+		local_file_size = -1;
+
+	total_file_size = 0;
 	need_create = 0;
+	create_size = 0;
 	for_each_file(td, f, i) {
 		int file_there;
 
 		if (f->filetype != FIO_TYPE_FILE)
 			continue;
-		if (f->flags & FIO_FILE_EXISTS)
+		if (f->flags & FIO_FILE_EXISTS) {
+			total_file_size += f->file_size;
 			continue;
+		}
 
-		f->file_size = total_file_size / new_files;
+		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;
+		create_size += f->file_size;
 		file_there = !file_ok(td, f);
 
-		if (file_there && td_write(td) && !td->overwrite) {
+		if (file_there && td_write(td) && !td->o.overwrite) {
 			unlink(f->file_name);
 			file_there = 0;
 		}
@@ -155,17 +233,15 @@ static int create_files(struct thread_data *td)
 	if (!need_create)
 		return 0;
 
-	if (!td->total_file_size) {
+	if (!td->o.size && !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 x %LuMiB == %LuMiB)\n",
-				td->name, new_files,
-				(total_file_size >> 20) / new_files,
-				total_file_size >> 20);
+	log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+				td->o.name, new_files, create_size >> 20);
 
 	err = 0;
 	for_each_file(td, f, i) {
@@ -174,9 +250,10 @@ static int create_files(struct thread_data *td)
 		 */
 		f->flags &= ~FIO_FILE_UNLINK;
 		if (file_ok(td, f)) {
-			if (td->unlink)
+			if (td->o.unlink)
 				f->flags |= FIO_FILE_UNLINK;
 
+			f->flags |= FIO_FILE_NOSORT;
 			err = create_file(td, f);
 			if (err)
 				break;
@@ -191,7 +268,7 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
 	struct stat st;
 
-	if (td->overwrite) {
+	if (td->o.overwrite) {
 		if (fstat(f->fd, &st) == -1) {
 			td_verror(td, errno, "fstat");
 			return 1;
@@ -246,7 +323,7 @@ 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;
 	}
 
@@ -257,7 +334,7 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 {
 	int ret = 0;
 
-	if (td->odirect)
+	if (td->o.odirect)
 		return 0;
 
 	/*
@@ -265,10 +342,14 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	 */
 	if (f->mmap)
 		ret = madvise(f->mmap, f->file_size, MADV_DONTNEED);
-	else if (f->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 (f->filetype == FIO_TYPE_BD) {
+	else if (f->filetype == FIO_TYPE_BD) {
 		ret = blockdev_invalidate_cache(f->fd);
+		if (ret < 0 && errno == EACCES && geteuid()) {
+			log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+			ret = 0;
+		}
 	} else if (f->filetype == FIO_TYPE_CHAR)
 		ret = 0;
 
@@ -290,9 +371,9 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 {
 	int flags = 0;
 
-	if (td->odirect)
+	if (td->o.odirect)
 		flags |= OS_O_DIRECT;
-	if (td->sync_io)
+	if (td->o.sync_io)
 		flags |= O_SYNC;
 
 	if (td_write(td) || td_rw(td)) {
@@ -312,22 +393,28 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 	}
 
 	if (f->fd == -1) {
+		char buf[FIO_VERROR_SIZE];
 		int __e = errno;
 
-		td_verror(td, __e, "open");
-		if (__e == EINVAL && td->odirect)
+		snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
+
+		td_verror(td, __e, buf);
+		if (__e == EINVAL && td->o.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);
+			log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
 		return 1;
 	}
 
 	if (get_file_size(td, f))
 		goto err;
 
-	if (td->invalidate_cache && file_invalidate_cache(td, f))
+	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
 		goto err;
 
+	if (!td->o.fadvise_hint)
+		return 0;
+
 	if (!td_random(td)) {
 		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
 			td_verror(td, errno, "fadvise");
@@ -357,7 +444,7 @@ int open_files(struct thread_data *td)
 		if (err)
 			break;
 
-		if (td->open_files == td->nr_open_files)
+		if (td->o.open_files == td->nr_open_files)
 			break;
 	}
 
@@ -393,21 +480,21 @@ int setup_files(struct thread_data *td)
 	/*
 	 * Recalculate the total file size now that files are set up.
 	 */
-	td->total_file_size = 0;
+	td->o.size = 0;
 	for_each_file(td, f, i)
-		td->total_file_size += f->file_size;
+		td->o.size += f->file_size;
 
-	td->io_size = td->total_file_size;
+	td->io_size = td->o.size;
 	if (td->io_size == 0) {
-		log_err("%s: no io blocks\n", td->name);
+		log_err("%s: no io blocks\n", td->o.name);
 		td_verror(td, EINVAL, "total_file_size");
 		return 1;
 	}
 
-	if (!td->zone_size)
-		td->zone_size = td->io_size;
+	if (!td->o.zone_size)
+		td->o.zone_size = td->io_size;
 
-	td->total_io_size = td->io_size * td->loops;
+	td->total_io_size = td->io_size * td->o.loops;
 
 	for_each_file(td, f, i)
 		td_io_close_file(td, f);
@@ -415,28 +502,55 @@ 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;
 	unsigned int i;
 
 	for_each_file(td, f, i) {
-		if (!f->file_name && (f->flags & FIO_FILE_UNLINK) &&
-		    f->filetype == FIO_TYPE_FILE) {
+		if ((f->flags & FIO_FILE_UNLINK) &&
+		    f->filetype == FIO_TYPE_FILE)
 			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_name);
+		f->file_name = NULL;
+
+		if (f->file_map) {
 			free(f->file_map);
+			f->file_map = NULL;
+		}
 	}
 
-	td->filename = NULL;
+	td->o.filename = NULL;
+	free(td->files);
 	td->files = NULL;
-	td->nr_files = 0;
+	td->o.nr_files = 0;
 }
 
 static void get_file_type(struct fio_file *f)
@@ -465,14 +579,21 @@ static void get_file_type(struct fio_file *f)
 void 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));
 
 	f = &td->files[cur_files];
 	memset(f, 0, sizeof(*f));
 	f->fd = -1;
-	f->file_name = strdup(fname);
+
+	if (td->o.directory)
+		len = sprintf(file_name, "%s/", td->o.directory);
+
+	sprintf(file_name + len, "%s", fname);
+	f->file_name = strdup(file_name);
 
 	get_file_type(f);
 
@@ -495,7 +616,7 @@ void put_file(struct thread_data *td, struct fio_file *f)
 	if (--f->references)
 		return;
 
-	if (should_fsync(td) && td->fsync_on_close)
+	if (should_fsync(td) && td->o.fsync_on_close)
 		fsync(f->fd);
 
 	if (td->io_ops->close_file)
@@ -534,7 +655,7 @@ 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;
 		}
 
@@ -550,3 +671,22 @@ int add_dir_files(struct thread_data *td, const char *path)
 {
 	return recurse_dir(td, path);
 }
+
+void dup_files(struct thread_data *td, struct thread_data *org)
+{
+	struct fio_file *f;
+	unsigned int i;
+	size_t bytes;
+
+	if (!org->files)
+		return;
+
+	bytes = org->files_index * sizeof(*f);
+	td->files = malloc(bytes);
+	memcpy(td->files, org->files, bytes);
+
+	for_each_file(td, f, i) {
+		if (f->file_name)
+			f->file_name = strdup(f->file_name);
+	}
+}