Merge branch 'gfio' of ssh://brick.kernel.dk/data/git/fio into gfio

[fio.git] / init.c

diff --git a/init.c b/init.c
index 8c9faec22f2cb5a67150d1264d600be1cdf709a9..261e02e1fb673ee8db30e0b7eff34843dda03a67 100644 (file)
--- a/init.c
+++ b/init.c
@@ -860,12 +860,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
                        if (is_backend && !recursed)
                                fio_server_send_add_job(td);
 
                        if (is_backend && !recursed)
                                fio_server_send_add_job(td);
 

-                       if (!strcmp(td->io_ops->name, "cpuio")) {
-                               log_info("%s: ioengine=cpu, cpuload=%u,"
-                                        " cpucycle=%u\n", td->o.name,
-                                                       td->o.cpuload,
-                                                       td->o.cpucycle);
-                       } else {
+                       if (!(td->io_ops->flags & FIO_NOIO)) {

                                char *c1, *c2, *c3, *c4;
 
                                c1 = fio_uint_to_kmg(td->o.min_bs[DDIR_READ]);
                                char *c1, *c2, *c3, *c4;
 
                                c1 = fio_uint_to_kmg(td->o.min_bs[DDIR_READ]);


@@ -1703,3 +1698,8 @@ int parse_options(int argc, char *argv[])
 
        return 0;
 }
 
        return 0;
 }

+
+void options_default_fill(struct thread_options *o)
+{
+       memcpy(o, &def_thread.o, sizeof(*o));
+}