X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=71d792ffaf21ad57a4d3f11dfcb5df01c0365c6e;hp=001e5c45f017c20dfdc2290374a7297b3fc02a21;hb=refs%2Ftags%2Ffio-1.26;hpb=8347239af0a361e160293100bfc053f88bbbf737

diff --git a/init.c b/init.c
index 001e5c45..71d792ff 100644
--- a/init.c
+++ b/init.c
@@ -19,7 +19,7 @@
 #include "smalloc.h"
 #include "filehash.h"
 
-static char fio_version_string[] = "fio 1.24";
+static char fio_version_string[] = "fio 1.26";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -273,6 +273,21 @@ static int fixup_options(struct thread_data *td)
 
 	o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]);
 
+	/*
+	 * For random IO, allow blockalign offset other than min_bs.
+	 */
+	if (!o->ba[DDIR_READ] || !td_random(td))
+		o->ba[DDIR_READ] = o->min_bs[DDIR_READ];
+	if (!o->ba[DDIR_WRITE] || !td_random(td))
+		o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE];
+
+	if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] ||
+	    o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) &&
+	    !td->o.norandommap) {
+		log_err("fio: Any use of blockalign= turns off randommap\n");
+		td->o.norandommap = 1;
+	}
+
 	if (!o->file_size_high)
 		o->file_size_high = o->file_size_low;
 
@@ -393,13 +408,32 @@ static int exists_and_not_file(const char *filename)
 	return 1;
 }
 
+void td_fill_rand_seeds(struct thread_data *td)
+{
+	os_random_seed(td->rand_seeds[0], &td->bsrange_state);
+	os_random_seed(td->rand_seeds[1], &td->verify_state);
+	os_random_seed(td->rand_seeds[2], &td->rwmix_state);
+
+	if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
+		os_random_seed(td->rand_seeds[3], &td->next_file_state);
+
+	os_random_seed(td->rand_seeds[5], &td->file_size_state);
+
+	if (!td_random(td))
+		return;
+
+	if (td->o.rand_repeatable)
+		td->rand_seeds[4] = FIO_RANDSEED * td->thread_number;
+
+	os_random_seed(td->rand_seeds[4], &td->random_state);
+}
+
 /*
  * Initialize the various random states we need (random io, block size ranges,
  * read/write mix, etc).
  */
 static int init_random_state(struct thread_data *td)
 {
-	unsigned long seeds[6];
 	int fd;
 
 	fd = open("/dev/urandom", O_RDONLY);
@@ -408,30 +442,15 @@ static int init_random_state(struct thread_data *td)
 		return 1;
 	}
 
-	if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
+	if (read(fd, td->rand_seeds, sizeof(td->rand_seeds)) <
+	    (int) sizeof(td->rand_seeds)) {
 		td_verror(td, EIO, "read");
 		close(fd);
 		return 1;
 	}
 
 	close(fd);
-
-	os_random_seed(seeds[0], &td->bsrange_state);
-	os_random_seed(seeds[1], &td->verify_state);
-	os_random_seed(seeds[2], &td->rwmix_state);
-
-	if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
-		os_random_seed(seeds[3], &td->next_file_state);
-
-	os_random_seed(seeds[5], &td->file_size_state);
-
-	if (!td_random(td))
-		return 0;
-
-	if (td->o.rand_repeatable)
-		seeds[4] = FIO_RANDSEED * td->thread_number;
-
-	os_random_seed(seeds[4], &td->random_state);
+	td_fill_rand_seeds(td);
 	return 0;
 }
 
@@ -585,6 +604,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		if (file_alloced) {
 			td_new->o.filename = NULL;
 			td_new->files_index = 0;
+			td_new->files_size = 0;
 			td_new->files = NULL;
 		}
 
@@ -607,7 +627,7 @@ static int skip_this_section(const char *name)
 	if (!strncmp(name, "global", 6))
 		return 0;
 
-	return strncmp(job_section, name, strlen(job_section));
+	return strcmp(job_section, name);
 }
 
 static int is_empty_or_comment(char *line)