Fix refill buffers overwriting verify data

[fio.git] / engines / cpu.c

diff --git a/engines/cpu.c b/engines/cpu.c
index d10669df0db0f4101138f68cc1b5589e31487273..c8eb6b30bf286e03c2a41d712d32e032eb51aa18 100644 (file)
--- a/engines/cpu.c
+++ b/engines/cpu.c
@@ -6,55 +6,39 @@
  *
  */
 #include "../fio.h"
-#include "../os.h"
 
 static int fio_cpuio_queue(struct thread_data *td, struct io_u fio_unused *io_u)
 {
-       __usec_sleep(td->cpucycle);
+       __usec_sleep(td->o.cpucycle);
        return FIO_Q_COMPLETED;
 }
 
-static int fio_cpuio_setup(struct thread_data fio_unused *td)
-{
-       struct fio_file *f;
-       unsigned int i;
-
-       td->total_file_size = -1;
-       td->io_size = td->total_file_size;
-       td->total_io_size = td->io_size;
-
-       for_each_file(td, f, i) {
-               f->real_file_size = -1;
-               f->file_size = -1;
-       }
-
-       return 0;
-}
-
 static int fio_cpuio_init(struct thread_data *td)
 {
-       if (!td->cpuload) {
+       struct thread_options *o = &td->o;
+
+       if (!o->cpuload) {
                td_vmsg(td, EINVAL, "cpu thread needs rate (cpuload=)","cpuio");
                return 1;
        }
 
-       if (td->cpuload > 100)
-               td->cpuload = 100;
+       if (o->cpuload > 100)
+               o->cpuload = 100;
 
        /*
         * set thinktime_sleep and thinktime_spin appropriately
         */
-       td->thinktime_blocks = 1;
-       td->thinktime_spin = 0;
-       td->thinktime = (td->cpucycle * (100 - td->cpuload)) / td->cpuload;
+       o->thinktime_blocks = 1;
+       o->thinktime_spin = 0;
+       o->thinktime = (o->cpucycle * (100 - o->cpuload)) / o->cpuload;
 
-       td->nr_files = td->open_files = 1;
+       o->nr_files = o->open_files = 1;
        return 0;
 }
 
-static int fio_cpuio_open(struct thread_data fio_unused *td, struct fio_file *f)
+static int fio_cpuio_open(struct thread_data fio_unused *td,
+                         struct fio_file fio_unused *f)
 {
-       f->fd = 0;
        return 0;
 }
 
@@ -63,9 +47,8 @@ static struct ioengine_ops ioengine = {
        .version        = FIO_IOOPS_VERSION,
        .queue          = fio_cpuio_queue,
        .init           = fio_cpuio_init,
-       .setup          = fio_cpuio_setup,
        .open_file      = fio_cpuio_open,
-       .flags          = FIO_SYNCIO | FIO_DISKLESSIO,
+       .flags          = FIO_SYNCIO | FIO_DISKLESSIO | FIO_NOIO,
 };
 
 static void fio_init fio_cpuio_register(void)