Use correct I/O engine name "cpuio" instead of "cpu"

"cpuio" is the name of the engine/option, though the filename is cpu.c.

 # grep "ioengine =" engines/cpu.c -A1
 static struct ioengine_ops ioengine = {
 	.name           = "cpuio",

Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/HOWTO b/HOWTO
index b9076d5e7708c8565b9ef35af304262a300972a4..2c5896d2c212149e65c108f931a589bc681aca29 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -1840,12 +1840,12 @@ that defines them is selected.
 [psyncv2] hipri                Set RWF_HIPRI on IO, indicating to the kernel that
                        it's of higher priority than normal.
 
-[cpu] cpuload=int Attempt to use the specified percentage of CPU cycles.
+[cpuio] cpuload=int Attempt to use the specified percentage of CPU cycles.
 
-[cpu] cpuchunks=int Split the load into cycles of the given time. In
+[cpuio] cpuchunks=int Split the load into cycles of the given time. In
                microseconds.
 
-[cpu] exit_on_io_done=bool Detect when IO threads are done, then exit.
+[cpuio] exit_on_io_done=bool Detect when IO threads are done, then exit.
 
 [netsplice] hostname=str
 [net] hostname=str The host name or IP address to use for TCP or UDP based IO.

diff --git a/engines/cpu.c b/engines/cpu.c
index 7643a8c591c39942b95db763694eac93bef59d98..3d855e363c3212ba3d0c656ac5e2e92de1da1c05 100644 (file)
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -88,8 +88,8 @@ static int fio_cpuio_init(struct thread_data *td)
 
        o->nr_files = o->open_files = 1;
 
-       log_info("%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->o.name,
-                                               co->cpuload, co->cpucycle);
+       log_info("%s: ioengine=%s, cpuload=%u, cpucycle=%u\n",
+               td->o.name, td->io_ops->name, co->cpuload, co->cpucycle);
 
        return 0;
 }

diff --git a/fio.1 b/fio.1
index a9abe3fcec4e6a87cce2c425800d3e894d02ddb1..85eb0fe981b0d0b89c40e9b714f48f9112778f25 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -1695,13 +1695,13 @@ Some parameters are only valid when a specific ioengine is in use. These are
 used identically to normal parameters, with the caveat that when used on the
 command line, they must come after the ioengine.
 .TP
-.BI (cpu)cpuload \fR=\fPint
+.BI (cpuio)cpuload \fR=\fPint
 Attempt to use the specified percentage of CPU cycles.
 .TP
-.BI (cpu)cpuchunks \fR=\fPint
+.BI (cpuio)cpuchunks \fR=\fPint
 Split the load into cycles of the given time. In microseconds.
 .TP
-.BI (cpu)exit_on_io_done \fR=\fPbool
+.BI (cpuio)exit_on_io_done \fR=\fPbool
 Detect when IO threads are done, then exit.
 .TP
 .BI (libaio)userspace_reap