->getevents() should take unsigned args

[fio.git] / options.c

diff --git a/options.c b/options.c
index 62bbb43c893a08d21be4418a8f2c68932af35066..0fc9955729f55ce54ce4a66d7284f5db74778097 100644 (file)
--- a/options.c
+++ b/options.c
@@ -74,6 +74,7 @@ static int str_prioclass_cb(void *data, unsigned int *val)
        td->ioprio &= mask;
 
        td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
+       td->ioprio_set = 1;
        return 0;
 }
 
@@ -89,6 +90,7 @@ static int str_prio_cb(void *data, unsigned int *val)
        if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
                td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
 
+       td->ioprio_set = 1;
        return 0;
 }
 #endif
@@ -217,12 +219,27 @@ static int str_verify_offset_cb(void *data, unsigned int *off)
        return 0;
 }
 
-static int str_verify_pattern_cb(void *data, unsigned int *off)
+static int str_verify_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
-       unsigned int msb;
+       unsigned int nr, msb;
+       char *pat;
 
-       msb = fls(*off);
+       if (td->o.verify != VERIFY_PATTERN)
+               return 0;
+
+       pat = get_opt_postfix(mem);
+       if (!pat) {
+               log_err("fio: missing pattern\n");
+               return 1;
+       }
+
+       if (strstr(pat, "0x") || strstr(pat, "0X"))
+               nr = strtol(pat, NULL, 16);
+       else
+               nr = strtol(pat, NULL, 16);
+
+       msb = fls(nr);
        if (msb <= 8)
                td->o.verify_pattern_bytes = 1;
        else if (msb <= 16)
@@ -232,7 +249,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
        else
                td->o.verify_pattern_bytes = 4;
 
-       td->o.verify_pattern = *off;
+       td->o.verify_pattern = nr;
        return 0;
 }
 
@@ -321,6 +338,9 @@ static struct fio_option options[] = {
                          { .ival = "sync",
                            .help = "Use read/write",
                          },
+                         { .ival = "psync",
+                           .help = "Use pread/pwrite",
+                         },
 #ifdef FIO_HAVE_LIBAIO
                          { .ival = "libaio",
                            .help = "Linux native asynchronous IO",
@@ -603,6 +623,7 @@ static struct fio_option options[] = {
                .name   = "verify",
                .type   = FIO_OPT_STR,
                .off1   = td_var_offset(verify),
+               .cb     = str_verify_cb,
                .help   = "Verify data written",
                .def    = "0",
                .posval = {
@@ -642,6 +663,10 @@ static struct fio_option options[] = {
                            .oval = VERIFY_META,
                            .help = "Use io information",
                          },
+                         { .ival = "pattern",
+                           .oval = VERIFY_PATTERN,
+                           .help = "Verify a specific buffer pattern",
+                         },
                          {
                            .ival = "null",
                            .oval = VERIFY_NULL,
@@ -651,7 +676,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "do_verify",
-               .type   = FIO_OPT_INT,
+               .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(do_verify),
                .help   = "Run verification stage after write",
                .def    = "1",
@@ -681,16 +706,9 @@ static struct fio_option options[] = {
                .cb     = str_verify_offset_cb, 
                .parent = "verify",
        },
-       {
-               .name   = "verify_pattern",
-               .type   = FIO_OPT_INT,
-               .cb     = str_verify_pattern_cb,
-               .help   = "Fill pattern for IO buffers",
-               .parent = "verify",
-       },
        {
                .name   = "verify_fatal",
-               .type   = FIO_OPT_INT,
+               .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(verify_fatal),
                .def    = "0",
                .help   = "Exit on a single verify failure, don't continue",