[PATCH] Remember to check ioops version in loaded module

[fio.git] / README

diff --git a/README b/README
index d6ff1096ce4c8482adab333b626e8aac2f2fd07c..359fc2d2f9bb977368c6d2460d13495256c563bf 100644 (file)
--- a/README
+++ b/README
@@ -46,7 +46,6 @@ $ fio
        -t <sec> Runtime in seconds
        -l Generate per-job latency logs
        -w Generate per-job bandwidth logs
-       -f <file> Read <file> for job descriptions
        -o <file> Log output to file
        -m Minimal (terse) output
        -h Print help info
@@ -102,7 +101,9 @@ The job file parameters are:
        cpumask=x       Only allow job to run on CPUs defined by mask.
        fsync=x         If writing, fsync after every x blocks have been written
        startdelay=x    Start this thread x seconds after startup
-       timeout=x       Terminate x seconds after startup
+       timeout=x       Terminate x seconds after startup. Can include a
+                       normal time suffix if not given in seconds, such as
+                       'm' for minutes, 'h' for hours, and 'd' for days.
        offset=x        Start io at offset x (x string can include k/m/g)
        invalidate=x    Invalidate page cache for file prior to doing io
        sync=x          Use sync writes if x and writing
@@ -141,6 +142,9 @@ The job file parameters are:
        exec_prerun=x   Run 'x' before job io is begun.
        exec_postrun=x  Run 'x' after job io has finished.
        ioscheduler=x   Use ioscheduler 'x' for this job.
+       cpuload=x       For a CPU io thread, percentage of CPU time to attempt
+                       to burn.
+       cpuchunks=x     Split burn cycles into pieces of x.
 
 
 Examples using a job file
@@ -332,11 +336,11 @@ Split up, the format is as follows:
 Author
 ------
 
-Fio was written by Jens Axboe <axboe@suse.de> to enable flexible testing
+Fio was written by Jens Axboe <axboe@kernel.dk> to enable flexible testing
 of the Linux IO subsystem and schedulers. He got tired of writing
 specific test applications to simulate a given workload, and found that
 the existing io benchmark/test tools out there weren't flexible enough
 to do what he wanted.
 
-Jens Axboe <axboe@suse.de> 20060609
+Jens Axboe <axboe@kernel.dk> 20060905