X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=124bdbbbf2fa30beabcb62e69814f2b20f951791;hp=59c5f7c848a8082aa61675107e4e6f498be3aa93;hb=refs%2Ftags%2Ffio-1.50-rc1;hpb=03f0a3c55c495bf9ef0668d2b6b047eb499e5e3f

diff --git a/init.c b/init.c
index 59c5f7c8..124bdbbb 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.38";
+#include "lib/getopt.h"
+
+static char fio_version_string[] = "fio 1.50-rc1";
 
 #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
@@ -428,7 +431,9 @@ static int exists_and_not_file(const char *filename)
 	if (lstat(filename, &sb) == -1)
 		return 0;
 
-	if (S_ISREG(sb.st_mode))
+	/* \\.\ is the device namespace in Windows, where every file
+	 * is a device node */
+	if (S_ISREG(sb.st_mode) && strncmp(filename, "\\\\.\\", 4) != 0)
 		return 0;
 
 	return 1;
@@ -444,6 +449,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 +561,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 +580,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);
 	}
@@ -776,6 +784,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 			break;
 		}
 
+		name[strlen(name) - 1] = '\0';
+
 		if (skip_this_section(name)) {
 			inside_skip = 1;
 			continue;
@@ -784,8 +794,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
 		global = !strncmp(name, "global", 6);
 
-		name[strlen(name) - 1] = '\0';
-
 		if (dump_cmdline) {
 			if (first_sect)
 				log_info("fio ");
@@ -881,9 +889,6 @@ static int fill_def_thread(void)
 	fio_fill_default_options(&def_thread);
 
 	def_thread.o.timeout = def_timeout;
-	def_thread.o.write_bw_log = write_bw_log;
-	def_thread.o.write_lat_log = write_lat_log;
-
 	return 0;
 }
 
@@ -955,7 +960,6 @@ static int setup_thread_area(void)
 
 static void usage(const char *name)
 {
-	printf("%s\n", fio_version_string);
 	printf("%s [options] [job options] <job file(s)>\n", name);
 	printf("\t--debug=options\tEnable debug logging\n");
 	printf("\t--output\tWrite output to file\n");
@@ -975,7 +979,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
@@ -992,6 +997,7 @@ struct debug_level debug_levels[] = {
 	{ .name = "job",	.shift = FD_JOB },
 	{ .name = "mutex",	.shift = FD_MUTEX },
 	{ .name	= "profile",	.shift = FD_PROFILE },
+	{ .name = "time",	.shift = FD_TIME },
 	{ .name = NULL, },
 };
 
@@ -1075,7 +1081,7 @@ static int parse_cmd_line(int argc, char *argv[])
 		case 'l':
 			write_lat_log = 1;
 			break;
-		case 'w':
+		case 'b':
 			write_bw_log = 1;
 			break;
 		case 'o':
@@ -1192,6 +1198,8 @@ int parse_options(int argc, char *argv[])
 	f_out = stdout;
 	f_err = stderr;
 
+	log_info("%s\n", fio_version_string);
+
 	fio_options_dup_and_init(l_opts);
 
 	if (setup_thread_area())
@@ -1218,7 +1226,7 @@ int parse_options(int argc, char *argv[])
 		if (exec_profile)
 			return 0;
 
-		log_err("No jobs defined(s)\n\n");
+		log_err("No jobs(s) defined\n\n");
 		usage(argv[0]);
 		return 1;
 	}