configure: stop enabling fdatasync on OSX

[fio.git] / engines / cpu.c

diff --git a/engines/cpu.c b/engines/cpu.c
index 3d855e363c3212ba3d0c656ac5e2e92de1da1c05..4d572b441a54921541e5d7e27ae8151c1dc4a2ce 100644 (file)
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -22,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,
        },
        {
@@ -34,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,
        },
        {
@@ -44,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,
        },
        {
@@ -53,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;
 
@@ -84,7 +85,7 @@ static int fio_cpuio_init(struct thread_data *td)
         */
        o->thinktime_blocks = 1;
        o->thinktime_spin = 0;
-       o->thinktime = (co->cpucycle * (100 - co->cpuload)) / co->cpuload;
+       o->thinktime = ((unsigned long long) co->cpucycle * (100 - co->cpuload)) / co->cpuload;
 
        o->nr_files = o->open_files = 1;