Merge branch 'no-unittest-dep' of https://github.com/parallel-fs-utils/fio

[fio.git] / engines / cpu.c

diff --git a/engines/cpu.c b/engines/cpu.c
index 85598ef77fb9acd8d4868d6e15de1d9f64bee83f..09872508e12129d1408040eadb40055c0ebb8181 100644 (file)
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -6,9 +6,10 @@
  *
  */
 #include "../fio.h"
+#include "../optgroup.h"
 
 struct cpu_options {
-       struct thread_data *td;
+       void *pad;
        unsigned int cpuload;
        unsigned int cpucycle;
        unsigned int exit_io_done;
@@ -21,7 +22,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = offsetof(struct cpu_options, cpuload),
                .help   = "Use this percentage of CPU",
-               .category = FIO_OPT_C_GENERAL,
+               .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_INVALID,
        },
        {
@@ -33,7 +34,7 @@ static struct fio_option options[] = {
                .def    = "50000",
                .parent = "cpuload",
                .hide   = 1,
-               .category = FIO_OPT_C_GENERAL,
+               .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_INVALID,
        },
        {
@@ -43,7 +44,7 @@ static struct fio_option options[] = {
                .off1   = offsetof(struct cpu_options, exit_io_done),
                .help   = "Exit when IO threads finish",
                .def    = "0",
-               .category = FIO_OPT_C_GENERAL,
+               .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_INVALID,
        },
        {
@@ -52,7 +53,8 @@ static struct fio_option options[] = {
 };
 
 
-static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
+static enum fio_q_status fio_cpuio_queue(struct thread_data *td,
+                                        struct io_u fio_unused *io_u)
 {
        struct cpu_options *co = td->eo;
 
@@ -87,8 +89,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;
 }