Add 'wait_for_previous' as an alias for the 'stonewall' option

Also update man page and HOWTO, plus add missing alias for
iomem_align while in there.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

diff --git a/HOWTO b/HOWTO
index 5e9b390bcf3902ce8f3d4400e102f49ace9f2329..88bd5e6c14f0f1ff356fbab964fd0a12a0a63c61 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -992,7 +992,8 @@ verify_backlog_batch=int    Control how many blocks fio will verify
                if verify_backlog_batch is larger than verify_backlog, some
                blocks will be verified more than once.
                
-stonewall      Wait for preceeding jobs in the job file to exit, before
+stonewall
+wait_for_previous Wait for preceeding jobs in the job file to exit, before
                starting this one. Can be used to insert serialization
                points in the job file. A stone wall also implies starting
                a new reporting group.

diff --git a/fio.1 b/fio.1
index e48a16a19e59484fdedfb10a56b3afb3113f9de1..65877d2001b5ab8d743e524699a33cacf6ff7f5e 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -630,7 +630,7 @@ number, eg echoing 8 will ensure that the OS has 8 huge pages ready for
 use.
 .RE
 .TP
-.BI iomem_align \fR=\fPint
+.BI iomem_align \fR=\fPint "\fR,\fP mem_align" \fR=\fPint
 This indiciates the memory alignment of the IO memory buffers. Note that the
 given alignment is applied to the first IO unit buffer, if using \fBiodepth\fR
 the alignment of the following buffers are given by the \fBbs\fR used. In
@@ -762,7 +762,7 @@ read back and verified).  If \fBverify_backlog_batch\fR is less than
 \fBverify_backlog_batch\fR is larger than \fBverify_backlog\fR,  some blocks
 will be verified more than once.
 .TP
-.B stonewall
+.B stonewall "\fR,\fP wait_for_previous"
 Wait for preceding jobs in the job file to exit before starting this one.
 \fBstonewall\fR implies \fBnew_group\fR.
 .TP

diff --git a/options.c b/options.c
index ffe54709c3061268a9850840343c90fb3a7e8f51..82e3e279dfe342f66ea98098604655630568a703 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1879,6 +1879,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        },
        {
                .name   = "stonewall",
+               .alias  = "wait_for_previous",
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(stonewall),
                .help   = "Insert a hard barrier between this job and previous",