X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=ff1385cdd02675f252b68502b4d59badd022d7d1;hp=d79fc61081278c934fd1c4aecbfe344666c75811;hb=ea966f8188915643670fd0a13d1bf37d45936da5;hpb=a9b7b3052b35c20e82b8fc909cd546a5fe1ff293

diff --git a/filesetup.c b/filesetup.c
index d79fc610..ff1385cd 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -9,6 +9,8 @@
 
 #include "fio.h"
 
+static int root_warn;
+
 static int extend_file(struct thread_data *td, struct fio_file *f)
 {
 	int r, new_layout = 0, unlink_file = 0, flags;
@@ -102,7 +104,7 @@ static unsigned long long get_rand_file_size(struct thread_data *td)
 	long r;
 
 	r = os_random_long(&td->file_size_state);
-	ret = td->o.file_size_low + (unsigned long long) ((double) td->o.file_size_high * (r / (RAND_MAX + 1.0)));
+	ret = td->o.file_size_low + (unsigned long long) ((double) (td->o.file_size_high - td->o.file_size_low) * (r / (RAND_MAX + 1.0)));
 	ret -= (ret % td->o.rw_min_bs);
 	return ret;
 }
@@ -178,7 +180,10 @@ int file_invalidate_cache(struct thread_data *td, struct fio_file *f)
 	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");
+			if (!root_warn) {
+				log_err("fio: only root may flush block devices. Cache flush bypassed!\n");
+				root_warn = 1;
+			}
 			ret = 0;
 		}
 	} else if (f->filetype == FIO_TYPE_CHAR || f->filetype == FIO_TYPE_PIPE)
@@ -373,6 +378,8 @@ int setup_files(struct thread_data *td)
 	extend_size = total_size = 0;
 	need_extend = 0;
 	for_each_file(td, f, i) {
+		f->file_offset = td->o.start_offset;
+
 		if (!td->o.file_size_low) {
 			/*
 			 * no file size range given, file size is equal to
@@ -380,20 +387,27 @@ int setup_files(struct thread_data *td)
 			 * zero, set it to the real file size.
 			 */
 			f->io_size = td->o.size / td->o.nr_files;
-			if (!f->io_size)
-				f->io_size = f->real_file_size;
+			if (!f->io_size) {
+				if (f->file_offset > f->real_file_size)
+					goto err_offset;
+				f->io_size = f->real_file_size - f->file_offset;
+			}
 		} else if (f->real_file_size < td->o.file_size_low ||
 			   f->real_file_size > td->o.file_size_high) {
+			if (f->file_offset > td->o.file_size_low) 
+				goto err_offset;
 			/*
 			 * file size given. if it's fixed, use that. if it's a
 			 * range, generate a random size in-between.
 			 */
 			if (td->o.file_size_low == td->o.file_size_high)
-				f->io_size = td->o.file_size_low;
+				f->io_size = td->o.file_size_low - f->file_offset;
 			else
-				f->io_size = get_rand_file_size(td);
-		} else
-			f->io_size = f->real_file_size;
+				f->io_size = get_rand_file_size(td) - f->file_offset;
+		} else if (f->file_offset > f->real_file_size)
+			goto err_offset;
+		else
+			f->io_size = f->real_file_size - f->file_offset;
 
 		if (f->io_size == -1ULL)
 			total_size = -1ULL;
@@ -401,15 +415,15 @@ int setup_files(struct thread_data *td)
 			total_size += f->io_size;
 
 		if (f->filetype == FIO_TYPE_FILE &&
-		    f->io_size > f->real_file_size &&
+		    (f->io_size + f->file_offset) > f->real_file_size &&
 		    !(td->io_ops->flags & FIO_DISKLESSIO)) {
 			need_extend++;
-			extend_size += f->io_size;
+			extend_size += (f->io_size + f->file_offset);
 			f->flags |= FIO_FILE_EXTEND;
-		}
+		}	
 	}
 
-	if (!td->o.size)
+	if (!td->o.size || td->o.size > total_size)
 		td->o.size = total_size;
 
 	/*
@@ -417,7 +431,7 @@ int setup_files(struct thread_data *td)
 	 */
 	if (need_extend) {
 		temp_stall_ts = 1;
-		log_info("%s: Laying out IO file(s) (%u files / %LuMiB)\n",
+		log_info("%s: Laying out IO file(s) (%u file(s) / %LuMiB)\n",
 			td->o.name, need_extend, extend_size >> 20);
 
 		for_each_file(td, f, i) {
@@ -426,7 +440,7 @@ int setup_files(struct thread_data *td)
 
 			assert(f->filetype == FIO_TYPE_FILE);
 			f->flags &= ~FIO_FILE_EXTEND;
-			f->real_file_size = f->io_size;
+			f->real_file_size = (f->io_size + f->file_offset);
 			err = extend_file(td, f);
 			if (err)
 				break;
@@ -440,8 +454,16 @@ int setup_files(struct thread_data *td)
 	if (!td->o.zone_size)
 		td->o.zone_size = td->o.size;
 
-	td->total_io_size = td->o.size * td->o.loops;
+	/*
+	 * iolog already set the total io size, if we read back
+	 * stored entries.
+	 */
+	if (!td->o.read_iolog_file)
+		td->total_io_size = td->o.size * td->o.loops;
 	return 0;
+err_offset:
+	log_err("%s: you need to specify valid offset=\n", td->o.name);
+	return 1;
 }
 
 int init_random_map(struct thread_data *td)
@@ -513,7 +535,7 @@ static void get_file_type(struct fio_file *f)
 	}
 }
 
-void add_file(struct thread_data *td, const char *fname)
+int add_file(struct thread_data *td, const char *fname)
 {
 	int cur_files = td->files_index;
 	char file_name[PATH_MAX];
@@ -543,10 +565,13 @@ void add_file(struct thread_data *td, const char *fname)
 	td->files_index++;
 	if (f->filetype == FIO_TYPE_FILE)
 		td->nr_normal_files++;
+
+	return cur_files;
 }
 
 void get_file(struct fio_file *f)
 {
+	assert(f->flags & FIO_FILE_OPEN);
 	f->references++;
 }
 
@@ -644,3 +669,28 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 			f->file_name = strdup(f->file_name);
 	}
 }
+
+/*
+ * Returns the index that matches the filename, or -1 if not there
+ */
+int get_fileno(struct thread_data *td, const char *fname)
+{
+	struct fio_file *f;
+	unsigned int i;
+
+	for_each_file(td, f, i)
+		if (!strcmp(f->file_name, fname))
+			return i;
+
+	return -1;
+}
+
+/*
+ * For log usage, where we add/open/close files automatically
+ */
+void free_release_files(struct thread_data *td)
+{
+	close_files(td);
+	td->files_index = 0;
+	td->nr_normal_files = 0;
+}