X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=f0ee37a348273ae56935214b4a2fae63783a4580;hb=d1c46c049cfba2028abc45246e2609bcee52d0f3;hp=b97c802b27c2e727423c9c3d30e8592ceb8317ff;hpb=efcc4586d3c8974118fd66d53a09ffd739d77d11;p=fio.git

diff --git a/init.c b/init.c
index b97c802b..f0ee37a3 100644
--- a/init.c
+++ b/init.c
@@ -8,7 +8,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
-#include <getopt.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/types.h>
@@ -21,7 +20,9 @@
 #include "verify.h"
 #include "profile.h"
 
-static char fio_version_string[] = "fio 1.39";
+#include "lib/getopt.h"
+
+static char fio_version_string[] = "fio 1.43.2";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
@@ -193,6 +194,8 @@ static int __setup_rate(struct thread_data *td, enum fio_ddir ddir)
 	unsigned int bs = td->o.min_bs[ddir];
 	unsigned long long bytes_per_sec;
 
+	assert(ddir_rw(ddir));
+
 	if (td->o.rate[ddir])
 		bytes_per_sec = td->o.rate[ddir];
 	else
@@ -360,11 +363,9 @@ static int fixup_options(struct thread_data *td)
 
 	if (o->verify != VERIFY_NONE) {
 		o->refill_buffers = 1;
-		if (o->verify == VERIFY_META) {
-			if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
-			    !o->verify_interval)
-				o->verify_interval = o->min_bs[DDIR_WRITE];
-		}
+		if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
+		    !o->verify_interval)
+			o->verify_interval = o->min_bs[DDIR_WRITE];
 	}
 
 	if (o->pre_read) {
@@ -557,8 +558,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
 	td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
 	td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
+	td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
 	td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
-	td->ddir_nr = td->o.ddir_nr;
+	td->ddir_seq_nr = td->o.ddir_seq_nr + 1;
 
 	if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
 		prev_group_jobs = 0;
@@ -575,6 +577,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		goto err;
 
 	if (td->o.write_lat_log) {
+		setup_log(&td->ts.lat_log);
 		setup_log(&td->ts.slat_log);
 		setup_log(&td->ts.clat_log);
 	}