Add some more options for commands

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/HOWTO b/HOWTO
index c14039318175c6170dbec9c3c7be55d80ff16801..460b456ce44b312a016346a62c30a7a8093bb86b 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -216,6 +216,7 @@ filename=str        Fio normally makes up a filename based on the job name,
 opendir=str    Tell fio to recursively add any file it can find in this
                directory and down the file system tree.
 
 opendir=str    Tell fio to recursively add any file it can find in this
                directory and down the file system tree.
 

+readwrite=str

 rw=str         Type of io pattern. Accepted values are:
 
                        read            Sequential reads
 rw=str         Type of io pattern. Accepted values are:
 
                        read            Sequential reads


@@ -244,6 +245,7 @@ filesize=siint      Individual file sizes. May be a range, in which case fio
                and limited to 'size' in total (if that is given). If not
                given, each created file is the same size.
 
                and limited to 'size' in total (if that is given). If not
                given, each created file is the same size.
 

+blocksize=siint

 bs=siint       The block size used for the io units. Defaults to 4k. Values
                can be given for both read and writes. If a single siint is
                given, it will apply to both. If a second siint is specified
 bs=siint       The block size used for the io units. Defaults to 4k. Values
                can be given for both read and writes. If a single siint is
                given, it will apply to both. If a second siint is specified


@@ -254,6 +256,7 @@ bs=siint    The block size used for the io units. Defaults to 4k. Values
                can do so by passing an empty read size - bs=,8k will set
                8k for writes and leave the read default value.
 
                can do so by passing an empty read size - bs=,8k will set
                8k for writes and leave the read default value.
 

+blocksize_range=irange

 bsrange=irange Instead of giving a single block size, specify a range
                and fio will mix the issued io block sizes. The issued
                io unit will always be a multiple of the minimum value
 bsrange=irange Instead of giving a single block size, specify a range
                and fio will mix the issued io block sizes. The issued
                io unit will always be a multiple of the minimum value


@@ -261,6 +264,7 @@ bsrange=irange      Instead of giving a single block size, specify a range
                writes, however a second range can be given after a comma.
                See bs=.
 
                writes, however a second range can be given after a comma.
                See bs=.
 

+blocksize_unaligned

 bs_unaligned   If this option is given, any byte size value within bsrange
                may be used as a block range. This typically wont work with
                direct IO, as that normally requires sector alignment.
 bs_unaligned   If this option is given, any byte size value within bsrange
                may be used as a block range. This typically wont work with
                direct IO, as that normally requires sector alignment.


@@ -452,6 +456,7 @@ invalidate=bool     Invalidate the buffer/page cache parts for this file prior
 sync=bool      Use sync io for buffered writes. For the majority of the
                io engines, this means using O_SYNC.
 
 sync=bool      Use sync io for buffered writes. For the majority of the
                io engines, this means using O_SYNC.
 

+iomem=str

 mem=str                Fio can use various types of memory as the io unit buffer.
                The allowed values are:
 
 mem=str                Fio can use various types of memory as the io unit buffer.
                The allowed values are:
 

diff --git a/options.c b/options.c
index f502247d1eb6323b27a3960ec9e20b01ffa2c9ae..81c864d8bfa3e50e7df7f44287bfec469ddc7260 100644 (file)
--- a/options.c
+++ b/options.c
@@ -201,6 +201,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "rw",
        },
        {
                .name   = "rw",

+               .alias  = "readwrite",

                .type   = FIO_OPT_STR,
                .off1   = td_var_offset(td_ddir),
                .help   = "IO direction",
                .type   = FIO_OPT_STR,
                .off1   = td_var_offset(td_ddir),
                .help   = "IO direction",


@@ -318,6 +319,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "bs",
        },
        {
                .name   = "bs",

+               .alias  = "blocksize",

                .type   = FIO_OPT_STR_VAL_INT,
                .off1   = td_var_offset(bs[DDIR_READ]),
                .off2   = td_var_offset(bs[DDIR_WRITE]),
                .type   = FIO_OPT_STR_VAL_INT,
                .off1   = td_var_offset(bs[DDIR_READ]),
                .off2   = td_var_offset(bs[DDIR_WRITE]),


@@ -326,6 +328,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "bsrange",
        },
        {
                .name   = "bsrange",

+               .alias  = "blocksize_range",

                .type   = FIO_OPT_RANGE,
                .off1   = td_var_offset(min_bs[DDIR_READ]),
                .off2   = td_var_offset(max_bs[DDIR_READ]),
                .type   = FIO_OPT_RANGE,
                .off1   = td_var_offset(min_bs[DDIR_READ]),
                .off2   = td_var_offset(max_bs[DDIR_READ]),


@@ -335,6 +338,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "bs_unaligned",
        },
        {
                .name   = "bs_unaligned",

+               .alias  = "blocksize_unaligned",

                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(bs_unaligned),
                .help   = "Don't sector align IO buffer sizes",
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(bs_unaligned),
                .help   = "Don't sector align IO buffer sizes",


@@ -450,6 +454,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "mem",
        },
        {
                .name   = "mem",

+               .alias  = "iomem",

                .type   = FIO_OPT_STR,
                .cb     = str_mem_cb,
                .off1   = td_var_offset(mem_type),
                .type   = FIO_OPT_STR,
                .cb     = str_mem_cb,
                .off1   = td_var_offset(mem_type),