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

diff --git a/fio-ini.c b/fio-ini.c
index d5150351..73cebf22 100644
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -36,6 +36,9 @@
 #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";
 
@@ -282,7 +285,7 @@ err:
 
 int init_random_state(struct thread_data *td)
 {
-	unsigned long seed;
+	unsigned long seeds[4];
 	int fd, num_maps, blocks;
 
 	fd = open("/dev/urandom", O_RDONLY);
@@ -291,7 +294,7 @@ int init_random_state(struct thread_data *td)
 		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;
@@ -299,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;
@@ -314,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;
 }
 
@@ -650,7 +654,7 @@ static int str_iolog_cb(struct thread_data *td, char *file)
 
 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;
@@ -791,6 +795,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;
@@ -933,6 +959,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