Change .category of cpuio to FIO_OPT_C_ENGINE

[fio.git] / engines / cpu.c

diff --git a/engines/cpu.c b/engines/cpu.c
index c798f1884e8dff8df9b079d87d61c8c4259ae10c..d0b4a895afcb78c3619adebb15854236a324785c 100644 (file)
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -6,11 +6,13 @@
  *
  */
 #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;
 };
 
 static struct fio_option options[] = {
@@ -20,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,
        },
        {
@@ -32,7 +34,17 @@ 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,
+       },
+       {
+               .name   = "exit_on_io_done",
+               .lname  = "Exit when IO threads are done",
+               .type   = FIO_OPT_BOOL,
+               .off1   = offsetof(struct cpu_options, exit_io_done),
+               .help   = "Exit when IO threads finish",
+               .def    = "0",
+               .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_INVALID,
        },
        {
@@ -45,6 +57,11 @@ static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
 {
        struct cpu_options *co = td->eo;
 
+       if (co->exit_io_done && !fio_running_or_pending_io_threads()) {
+               td->done = 1;
+               return FIO_Q_BUSY;
+       }
+
        usec_spin(co->cpucycle);
        return FIO_Q_COMPLETED;
 }
@@ -71,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;
 }