X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=e13b2b241342092b0d60b5c7b499fed4e85a0582;hb=d6c6810f335af8a5117013f63903a215a2f802e5;hp=e5ee4cf4d8dff1267367d447b0a3d12638645600;hpb=b370e46abdd2bfe764e28efb41c4caadc632b937;p=fio.git

diff --git a/options.c b/options.c
index e5ee4cf4..e13b2b24 100644
--- a/options.c
+++ b/options.c
@@ -280,6 +280,11 @@ static struct fio_option options[] = {
 			  { .ival = "cpuio",
 			    .help = "CPU cycler burner engine",
 			  },
+#ifdef FIO_HAVE_GUASI
+			  { .ival = "guasi",
+			    .help = "GUASI IO engine",
+			  },
+#endif
 			  { .ival = "external",
 			    .help = "Load external engine (append name)",
 			  },
@@ -465,26 +470,26 @@ static struct fio_option options[] = {
 			    .oval = MEM_MALLOC,
 			    .help = "Use malloc(3) for IO buffers",
 			  },
+			  { .ival = "shm",
+			    .oval = MEM_SHM,
+			    .help = "Use shared memory segments for IO buffers",
+			  },
 #ifdef FIO_HAVE_HUGETLB
 			  { .ival = "shmhuge",
 			    .oval = MEM_SHMHUGE,
 			    .help = "Like shm, but use huge pages",
 			  },
-			  { .ival = "shm",
-			    .oval = MEM_SHM,
-			    .help = "Use shared memory segments for IO buffers",
-			  },
 #endif
+			  { .ival = "mmap",
+			    .oval = MEM_MMAP,
+			    .help = "Use mmap(2) (file or anon) for IO buffers",
+			  },
 #ifdef FIO_HAVE_HUGETLB
 			  { .ival = "mmaphuge",
 			    .oval = MEM_MMAPHUGE,
 			    .help = "Like mmap, but use huge pages",
 			  },
 #endif
-			  { .ival = "mmap",
-			    .oval = MEM_MMAP,
-			    .help = "Use mmap(2) (file or anon) for IO buffers",
-			  },
 		  },
 	},
 	{
@@ -571,7 +576,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "rwmixread",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rwmixread),
+		.off1	= td_var_offset(rwmix[DDIR_READ]),
 		.maxval	= 100,
 		.help	= "Percentage of mixed workload that is reads",
 		.def	= "50",
@@ -579,7 +584,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "rwmixwrite",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rwmixwrite),
+		.off1	= td_var_offset(rwmix[DDIR_WRITE]),
 		.maxval	= 100,
 		.help	= "Percentage of mixed workload that is writes",
 		.def	= "50",
@@ -752,6 +757,12 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(stonewall),
 		.help	= "Insert a hard barrier between this job and previous",
 	},
+	{
+		.name	= "new_group",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(new_group),
+		.help	= "Mark the start of a new group (for reporting)",
+	},
 	{
 		.name	= "thread",
 		.type	= FIO_OPT_STR_SET,