X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio-ini.c;h=d2122e3fd3c7f17361b0f1d7ced0dab4fcabc510;hp=9b9262c9d8e0274528ce991190b01b365d86e523;hb=da86774e5a002acf2c8d779b805305bc193fc0a5;hpb=a4e167ee3ba40cb0587cf27dca2a9f8b947e568a

diff --git a/fio-ini.c b/fio-ini.c
index 9b9262c9..d2122e3f 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -36,8 +36,11 @@
 #define DEF_FILE_SIZE		(1024 * 1024 * 1024UL)
 #define DEF_ZONE_SIZE		(0)
 #define DEF_ZONE_SKIP		(0)
+#define DEF_RWMIX_CYCLE		(500)
+#define DEF_RWMIX_READ		(50)
+#define DEF_NICE		(0)
 
-static char fio_version_string[] = "fio 1.3";
+static char fio_version_string[] = "fio 1.4";
 
 static int repeatable = DEF_RAND_REPEAT;
 static char *ini_file;
@@ -165,7 +168,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" };
@@ -213,7 +216,7 @@ static int add_job(struct thread_data *td, const char *jobname)
 	}
 
 	if (td->filetype == FIO_TYPE_FILE) {
-		if (td->directory[0] != '\0')
+		if (td->directory && td->directory[0] != '\0')
 			sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
 		else
 			sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
@@ -249,7 +252,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
@@ -265,8 +272,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;
@@ -277,16 +285,16 @@ err:
 
 int init_random_state(struct thread_data *td)
 {
-	unsigned long seed;
+	unsigned long seeds[4];
 	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;
 	}
 
-	if (read(fd, &seed, sizeof(seed)) < (int) sizeof(seed)) {
+	if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
 		td_verror(td, EIO);
 		close(fd);
 		return 1;
@@ -294,14 +302,15 @@ int init_random_state(struct thread_data *td)
 
 	close(fd);
 
-	srand48_r(seed, &td->bsrange_state);
-	srand48_r(seed, &td->verify_state);
+	srand48_r(seeds[0], &td->bsrange_state);
+	srand48_r(seeds[1], &td->verify_state);
+	srand48_r(seeds[2], &td->rwmix_state);
 
 	if (td->sequential)
 		return 0;
 
 	if (repeatable)
-		seed = DEF_RANDSEED;
+		seeds[3] = DEF_RANDSEED;
 
 	blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
 	num_maps = blocks / BLOCKS_PER_MAP;
@@ -309,7 +318,7 @@ int init_random_state(struct thread_data *td)
 	td->num_maps = num_maps;
 	memset(td->file_map, 0, num_maps * sizeof(long));
 
-	srand48_r(seed, &td->random_state);
+	srand48_r(seeds[3], &td->random_state);
 	return 0;
 }
 
@@ -397,8 +406,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;
 
@@ -413,8 +426,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;
 
@@ -449,6 +466,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,18 +648,35 @@ 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);
+	td->iolog_file = strdup(file);
+	return 0;
+}
 
+static int str_prerun_cb(struct thread_data *td, char *file)
+{
+	td->exec_prerun = strdup(file);
+	return 0;
+}
+
+static int str_postrun_cb(struct thread_data *td, char *file)
+{
+	td->exec_postrun = strdup(file);
+	return 0;
+}
+
+static int str_iosched_cb(struct thread_data *td, char *file)
+{
+	td->ioscheduler = strdup(file);
 	return 0;
 }
 
 int parse_jobs_ini(char *file)
 {
-	unsigned int prioclass, prio, cpu, global;
+	unsigned int prioclass, prio, cpu, global, il;
 	unsigned long long ull;
 	unsigned long ul1, ul2;
 	struct thread_data *td;
-	char *string, *name;
+	char *string, *name, *tmpbuf;
 	fpos_t off;
 	FILE *f;
 	char *p;
@@ -652,6 +689,7 @@ int parse_jobs_ini(char *file)
 
 	string = malloc(4096);
 	name = malloc(256);
+	tmpbuf = malloc(4096);
 
 	while ((p = fgets(string, 4096, f)) != NULL) {
 		if (is_empty_or_comment(p))
@@ -776,6 +814,28 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
+			if (!check_int(p, "rwmixcycle", &td->rwmixcycle)) {
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_int(p, "rwmixread", &il)) {
+				if (il > 100)
+					il = 100;
+				td->rwmixread = il;
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_int(p, "rwmixwrite", &il)) {
+				if (il > 100)
+					il = 100;
+				td->rwmixread = 100 - il;
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_int(p, "nice", &td->nice)) {
+				fgetpos(f, &off);
+				continue;
+			}
 			if (!check_range(p, "bsrange", &ul1, &ul2)) {
 				if (ul1 > ul2) {
 					td->max_bs = ul1;
@@ -812,7 +872,8 @@ int parse_jobs_ini(char *file)
 				fgetpos(f, &off);
 				continue;
 			}
-			if (!check_strstore(p, "directory", td->directory)) {
+			if (!check_strstore(p, "directory", tmpbuf)) {
+				td->directory = strdup(tmpbuf);
 				fgetpos(f, &off);
 				continue;
 			}
@@ -853,7 +914,26 @@ int parse_jobs_ini(char *file)
 				continue;
 			}
 			if (!check_str(p, "iolog", str_iolog_cb, td)) {
-				td->iolog = 1;
+				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)) {
+				td->write_iolog = 1;
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_str(p, "exec_prerun", str_prerun_cb, td)) {
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_str(p, "exec_postrun", str_postrun_cb, td)) {
+				fgetpos(f, &off);
+				continue;
+			}
+			if (!check_str(p, "ioscheduler", str_iosched_cb, td)) {
 				fgetpos(f, &off);
 				continue;
 			}
@@ -863,12 +943,13 @@ int parse_jobs_ini(char *file)
 		}
 		fsetpos(f, &off);
 
-		if (add_job(td, name))
+		if (add_job(td, name, 0))
 			return 1;
 	}
 
 	free(string);
 	free(name);
+	free(tmpbuf);
 	fclose(f);
 	return 0;
 }
@@ -909,6 +990,9 @@ static int fill_def_thread(void)
 	def_thread.stonewall = DEF_STONEWALL;
 	def_thread.numjobs = DEF_NUMJOBS;
 	def_thread.use_thread = DEF_USE_THREAD;
+	def_thread.rwmixcycle = DEF_RWMIX_CYCLE;
+	def_thread.rwmixread = DEF_RWMIX_READ;
+	def_thread.nice = DEF_NICE;
 #ifdef FIO_HAVE_DISK_UTIL
 	def_thread.do_disk_util = 1;
 #endif