X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio-ini.c;h=d51503519ff709875ebb56cb210a671ad118de59;hb=843a741389226f5f2d0ce8636cd57532be9b7e4d;hp=eeef3052ec08056ed1ae96829e603de39775bb1f;hpb=1bb6b2a5c9b79af8ca03e8e29ad2a2eb3e6d83e7;p=fio.git

diff --git a/fio-ini.c b/fio-ini.c
index eeef3052..d5150351 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -50,6 +50,7 @@ int rate_quit = 0;
 int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 0;
+unsigned long long mlock_size = 0;
 
 static int setup_rate(struct thread_data *td)
 {
@@ -164,7 +165,7 @@ static void put_job(struct thread_data *td)
 	thread_number--;
 }
 
-static int add_job(struct thread_data *td, const char *jobname)
+static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
 	char *ddir_str[] = { "read", "write", "randread", "randwrite",
 			     "rw", NULL, "randrw" };
@@ -248,7 +249,11 @@ static int add_job(struct thread_data *td, const char *jobname)
 		setup_log(&td->bw_log);
 
 	ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
-	printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+
+	if (!job_add_num)
+		printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+	else if (job_add_num == 1)
+		printf("...\n");
 
 	/*
 	 * recurse add identical jobs, clear numjobs and stonewall options
@@ -264,8 +269,9 @@ static int add_job(struct thread_data *td, const char *jobname)
 		td_new->numjobs = 1;
 		td_new->stonewall = 0;
 		td_new->jobnum = numjobs;
+		job_add_num = numjobs - 1;
 
-		if (add_job(td_new, jobname))
+		if (add_job(td_new, jobname, job_add_num))
 			goto err;
 	}
 	return 0;
@@ -279,7 +285,7 @@ int init_random_state(struct thread_data *td)
 	unsigned long seed;
 	int fd, num_maps, blocks;
 
-	fd = open("/dev/random", O_RDONLY);
+	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
 		td_verror(td, errno);
 		return 1;
@@ -396,8 +402,12 @@ typedef int (str_cb_fn)(struct thread_data *, char *);
 
 static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td)
 {
-	char *s = strstr(p, name);
+	char *s;
 
+	if (strncmp(p, name, strlen(name)))
+		return 1;
+
+	s = strstr(p, name);
 	if (!s)
 		return 1;
 
@@ -412,8 +422,12 @@ static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td)
 
 static int check_strstore(char *p, char *name, char *dest)
 {
-	char *s = strstr(p, name);
+	char *s;
 
+	if (strncmp(p, name, strlen(name)))
+		return 1;
+
+	s = strstr(p, name);
 	if (!s)
 		return 1;
 
@@ -448,6 +462,9 @@ static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
 	char option[128];
 	char *str, *p1, *p2;
 
+	if (strncmp(p, name, strlen(name)))
+		return 1;
+
 	strcpy(option, p);
 	p = option;
 
@@ -628,7 +645,6 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 static int str_iolog_cb(struct thread_data *td, char *file)
 {
 	strncpy(td->iolog_file, file, sizeof(td->iolog_file) - 1);
-
 	return 0;
 }
 
@@ -807,6 +823,10 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_strcnv(p, "lockmem", &mlock_size)) {
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_strstore(p, "directory", td->directory)) {
 				fgetpos(f, &off);
 				continue;
@@ -848,7 +868,16 @@ int parse_jobs_ini(char *file)
 				continue;
 			}
 			if (!check_str(p, "iolog", str_iolog_cb, td)) {
-				td->iolog = 1;
+				printf("got read iolog\n");
+				td->read_iolog = 1;
+				td->write_iolog = 0;
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!td->read_iolog &&
+			    !check_str(p, "write_iolog", str_iolog_cb, td)) {
+				printf("got write iolog\n");
+				td->write_iolog = 1;
 				fgetpos(f, &off);
 				continue;
 			}
@@ -858,7 +887,7 @@ int parse_jobs_ini(char *file)
 		}
 		fsetpos(f, &off);
 
-		if (add_job(td, name))
+		if (add_job(td, name, 0))
 			return 1;
 	}