X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=e22ae12587e38e38a89228f862bdc4de04953639;hp=31485412cc4909d25964c5a661da004fda1415c3;hb=refs%2Ftags%2Ffio-1.44;hpb=983a69d71e6f9c0c8f590f24d492f9efba19232b

diff --git a/init.c b/init.c
index 31485412..e22ae125 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-rc1";
+#include "lib/getopt.h"
+
+static char fio_version_string[] = "fio 1.44";
 
 #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
@@ -444,6 +447,7 @@ void td_fill_rand_seeds(struct thread_data *td)
 		os_random_seed(td->rand_seeds[3], &td->next_file_state);
 
 	os_random_seed(td->rand_seeds[5], &td->file_size_state);
+	os_random_seed(td->rand_seeds[6], &td->trim_state);
 
 	if (!td_random(td))
 		return;
@@ -555,8 +559,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;
 
 	if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
 		prev_group_jobs = 0;
@@ -573,6 +578,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);
 	}
@@ -972,7 +978,8 @@ static void usage(const char *name)
 	printf("\t--section=name\tOnly run specified section in job file\n");
 	printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
 		" (def 1024)\n");
-	printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>\n");
+	printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
+	printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
 }
 
 #ifdef FIO_INC_DEBUG