X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=37cf050894099ba5be67fccfc9b194c53201b56c;hp=616c51f27ff738e7d2d2bd3eddbf7c924d693c3b;hb=f8977ee606bc51138a77f6a1b653df00faa77742;hpb=a00735e66f9ec42549da94eba3170e543b542904

diff --git a/init.c b/init.c
index 616c51f2..37cf0508 100644
--- a/init.c
+++ b/init.c
@@ -60,8 +60,10 @@ static int str_ioengine_cb(void *, const char *);
 static int str_mem_cb(void *, const char *);
 static int str_verify_cb(void *, const char *);
 static int str_lockmem_cb(void *, unsigned long *);
+#ifdef FIO_HAVE_IOPRIO
 static int str_prio_cb(void *, unsigned int *);
 static int str_prioclass_cb(void *, unsigned int *);
+#endif
 static int str_exitall_cb(void);
 static int str_cpumask_cb(void *, unsigned int *);
 
@@ -138,18 +140,9 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "bs",
-		.type	= FIO_OPT_STR_VAL,
+		.type	= FIO_OPT_STR_VAL_INT,
 		.off1	= td_var_offset(bs[DDIR_READ]),
-	},
-	{
-		.name	= "read_bs",
-		.type	= FIO_OPT_STR_VAL,
-		.off1	= td_var_offset(bs[DDIR_READ]),
-	},
-	{
-		.name	= "write_bs",
-		.type	= FIO_OPT_STR_VAL,
-		.off1	= td_var_offset(bs[DDIR_WRITE]),
+		.off2	= td_var_offset(bs[DDIR_WRITE]),
 	},
 	{
 		.name	= "offset",
@@ -176,18 +169,8 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_RANGE,
 		.off1	= td_var_offset(min_bs[DDIR_READ]),
 		.off2	= td_var_offset(max_bs[DDIR_READ]),
-	},
-	{
-		.name	= "read_bsrange",
-		.type	= FIO_OPT_RANGE,
-		.off1	= td_var_offset(min_bs[DDIR_READ]),
-		.off2	= td_var_offset(max_bs[DDIR_READ]),
-	},
-	{
-		.name	= "write_bsrange",
-		.type	= FIO_OPT_RANGE,
-		.off1	= td_var_offset(min_bs[DDIR_WRITE]),
-		.off2	= td_var_offset(max_bs[DDIR_WRITE]),
+		.off3	= td_var_offset(min_bs[DDIR_WRITE]),
+		.off4	= td_var_offset(max_bs[DDIR_WRITE]),
 	},
 	{
 		.name	= "nrfiles",
@@ -506,16 +489,14 @@ static void fixup_options(struct thread_data *td)
 	if (td_read(td) || td_rw(td))
 		td->overwrite = 1;
 
-	if (td->bs[DDIR_READ] != DEF_BS)
-		td->bs[DDIR_WRITE] = td->bs[DDIR_READ];
 	if (!td->min_bs[DDIR_READ])
 		td->min_bs[DDIR_READ]= td->bs[DDIR_READ];
 	if (!td->max_bs[DDIR_READ])
 		td->max_bs[DDIR_READ] = td->bs[DDIR_READ];
 	if (!td->min_bs[DDIR_WRITE])
-		td->min_bs[DDIR_WRITE]= td->bs[DDIR_READ];
+		td->min_bs[DDIR_WRITE]= td->bs[DDIR_WRITE];
 	if (!td->max_bs[DDIR_WRITE])
-		td->max_bs[DDIR_WRITE] = td->bs[DDIR_READ];
+		td->max_bs[DDIR_WRITE] = td->bs[DDIR_WRITE];
 
 	td->rw_min_bs = min(td->min_bs[DDIR_READ], td->min_bs[DDIR_WRITE]);
 
@@ -530,6 +511,27 @@ static void fixup_options(struct thread_data *td)
 		log_err("fio: bs_unaligned may not work with raw io\n");
 }
 
+/*
+ * This function leaks the buffer
+ */
+static char *to_kmg(unsigned int val)
+{
+	char *buf = malloc(32);
+	char post[] = { 0, 'K', 'G', 'P', -1 };
+	char *p = post;
+
+	while (*p != -1) {
+		if (val & 1023)
+			break;
+
+		val >>= 10;
+		p++;
+	}
+
+	snprintf(buf, 31, "%u%c", val, *p);
+	return buf;
+}
+
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -543,19 +545,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 	int numjobs, ddir, i;
 	struct fio_file *f;
 
-#ifndef FIO_HAVE_LIBAIO
-	if (td->io_engine == FIO_LIBAIO) {
-		log_err("Linux libaio not available\n");
-		return 1;
-	}
-#endif
-#ifndef FIO_HAVE_POSIXAIO
-	if (td->io_engine == FIO_POSIXAIO) {
-		log_err("posix aio not available\n");
-		return 1;
-	}
-#endif
-
 	/*
 	 * the def_thread is just for options, it's not a real job
 	 */
@@ -656,8 +645,21 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		if (!job_add_num) {
 			if (td->io_ops->flags & FIO_CPUIO)
 				fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
-			else
-				fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d/%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs[DDIR_READ], td->max_bs[DDIR_READ], td->min_bs[DDIR_WRITE], td->max_bs[DDIR_WRITE], td->rate, td->io_ops->name, td->iodepth);
+			else {
+				char *c1, *c2, *c3, *c4;
+
+				c1 = to_kmg(td->min_bs[DDIR_READ]);
+				c2 = to_kmg(td->max_bs[DDIR_READ]);
+				c3 = to_kmg(td->min_bs[DDIR_WRITE]);
+				c4 = to_kmg(td->max_bs[DDIR_WRITE]);
+
+				fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%s-%s/%s-%s, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
+
+				free(c1);
+				free(c2);
+				free(c3);
+				free(c4);
+			}
 		} else if (job_add_num == 1)
 			fprintf(f_out, "...\n");
 	}
@@ -857,6 +859,7 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
 	return 0;
 }
 
+#ifdef FIO_HAVE_IOPRIO
 static int str_prioclass_cb(void *data, unsigned int *val)
 {
 	struct thread_data *td = data;
@@ -872,6 +875,7 @@ static int str_prio_cb(void *data, unsigned int *val)
 	td->ioprio |= *val;
 	return 0;
 }
+#endif
 
 static int str_exitall_cb(void)
 {