Move gtod_cpu affinity check to verify callback

[fio.git] / options.c

diff --git a/options.c b/options.c
index 7135231eefeed59b73cf720c73aab14c5c66a3c8..8c0c2abd295c667ddc195f7acaa34f9aa7ce5f14 100644 (file)
--- a/options.c
+++ b/options.c
@@ -575,6 +575,34 @@ static int str_gtod_cpu_cb(void *data, int *il)
        return 0;
 }
 
+static int rw_verify(struct fio_option *o, void *data)
+{
+       struct thread_data *td = data;
+
+       if (read_only && td_write(td)) {
+               log_err("fio: job <%s> has write bit set, but fio is in"
+                       " read-only mode\n", td->o.name);
+               return 1;
+       }
+
+       return 0;
+}
+
+static int gtod_cpu_rw_verify(struct fio_option *o, void *data)
+{
+       struct thread_data *td = data;
+
+#ifndef FIO_HAVE_CPU_AFFINITY
+       if (td->o.gtod_cpu) {
+               log_err("fio: platform must support CPU affinity for"
+                       "gettimeofday() offloading\n");
+               return 1;
+       }
+#endif
+
+       return 0;
+}
+
 #define __stringify_1(x)       #x
 #define __stringify(x)         __stringify_1(x)
 
@@ -648,6 +676,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(td_ddir),
                .help   = "IO direction",
                .def    = "read",
+               .verify = rw_verify,
                .posval = {
                          { .ival = "read",
                            .oval = TD_DDIR_READ,
@@ -1520,6 +1549,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .cb     = str_gtod_cpu_cb,
                .help   = "Setup dedicated gettimeofday() thread on this CPU",
+               .verify = gtod_cpu_verify,
        },
        {
                .name   = "continue_on_error",